From f2c1e10b8ac3531ab5a48e23c23b702cd24b3f73 Mon Sep 17 00:00:00 2001 From: Konstantin Menyaev Date: Wed, 1 Feb 2023 09:00:01 +0300 Subject: [PATCH 01/66] package/tinyalsa: add option to enable utility tools Add option to enable useful tools, like tinyplay, tinymix, etc. Signed-off-by: Konstantin Menyaev Signed-off-by: Thomas Petazzoni --- package/tinyalsa/Config.in | 9 +++++++++ package/tinyalsa/tinyalsa.mk | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package/tinyalsa/Config.in b/package/tinyalsa/Config.in index d9ce22c8a7..b4d4aeb276 100644 --- a/package/tinyalsa/Config.in +++ b/package/tinyalsa/Config.in @@ -13,5 +13,14 @@ config BR2_PACKAGE_TINYALSA https://github.com/tinyalsa/tinyalsa +if BR2_PACKAGE_TINYALSA + +config BR2_PACKAGE_TINYALSA_TOOLS + bool "tinyalsa tools" + help + Build utility tools (tinyplay, tinycap, tinymix, tinypcminfo) + +endif #BR2_PACKAGE_TINYALSA + comment "tinyalsa needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS diff --git a/package/tinyalsa/tinyalsa.mk b/package/tinyalsa/tinyalsa.mk index b5c39e35d6..fe6d373ec8 100644 --- a/package/tinyalsa/tinyalsa.mk +++ b/package/tinyalsa/tinyalsa.mk @@ -9,6 +9,12 @@ TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION)) TINYALSA_LICENSE = BSD-3-Clause TINYALSA_LICENSE_FILES = NOTICE TINYALSA_INSTALL_STAGING = YES -TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled +TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled + +ifeq ($(BR2_PACKAGE_TINYALSA_TOOLS),y) +TINYALSA_CONF_OPTS += -Dutils=enabled +else +TINYALSA_CONF_OPTS += -Dutils=disabled +endif $(eval $(meson-package)) From cc0d6bdd66e477ee0e3de0538e37d49bdfd7a9e6 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 15 Feb 2023 14:47:12 -0800 Subject: [PATCH 02/66] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- ...ARCv2-ISA-processors-support-to-Zero.patch | 20 +++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) rename package/openjdk/{17.0.1+12 => 17.0.6+10}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (83%) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 4d3942125f..241ca34a04 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz -sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz +sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz +sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz -sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz +sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz +sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 608a0bc3ac..c3eb0b05e6 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a419..dfd3b07bea 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d..0a67e7a3ec 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c4..0fe506bbfd 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) From 4d7f902eb127eb9dd1334cda04a2008d14945a7d Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 15 Feb 2023 21:09:01 +0100 Subject: [PATCH 03/66] configs/bananapi_m2_ultra_defconfig: bump Linux to 6.1 and U-Boot to 2023.01 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/bananapi_m2_ultra_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/bananapi_m2_ultra_defconfig b/configs/bananapi_m2_ultra_defconfig index 2ec0e60e8d..0f267021f8 100644 --- a/configs/bananapi_m2_ultra_defconfig +++ b/configs/bananapi_m2_ultra_defconfig @@ -1,12 +1,12 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Ultra" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-ultra/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-r40-bananapi-m2-ultra" @@ -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="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m2_berry" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 60ab36a931f5d88cccb08575076e68d5e3757ae9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 15 Feb 2023 21:09:02 +0100 Subject: [PATCH 04/66] DEVELOPERS: add Giulio Benetti as maintainer for board bananapi-m2-ultra Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 2eff5b23ef..caa73698f9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1135,9 +1135,11 @@ F: package/webp/ F: package/xapian/ N: Giulio Benetti +F: board/bananapi/bananapi-m2-ultra/ F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig +F: configs/bananapi_m2_ultra_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ From 497e60a2fa7e11644a41cf4a9441f7fde6c782ac Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 16 Feb 2023 22:25:51 +0100 Subject: [PATCH 05/66] configs/imx6ullevk_defconfig: bump Linux to 6.1.12 and U-Boot to 2023.01 Let's also reorder BR2_UBOOT_ options by moving BR2_TARGET_UBOOT_FORMAT_DTB_IMX after BR2_TARGET_UBOOT_NEEDS_OPENSSL since this reflects the order in boot/uboot/Config.in file. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/imx6ullevk_defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/imx6ullevk_defconfig b/configs/imx6ullevk_defconfig index c6e2981697..b507d1c0d6 100644 --- a/configs/imx6ullevk_defconfig +++ b/configs/imx6ullevk_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.14 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=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="5.14.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -22,10 +22,10 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" -BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y # required tools to create the SD card image BR2_PACKAGE_HOST_DOSFSTOOLS=y From 9e09ac2c02d1ff8d3872ebc72e915e9baa7fbd0d Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 16 Feb 2023 22:25:52 +0100 Subject: [PATCH 06/66] configs/freescale_imx6ullevk_defconfig: bump Linux and U-Boot to lf-5.15.71-2.2.0 Let's also enable BR2_TARGET_UBOOT_NEEDS_OPENSSL required by uboot to build correctly. Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- configs/freescale_imx6ullevk_defconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configs/freescale_imx6ullevk_defconfig b/configs/freescale_imx6ullevk_defconfig index 7a8965be18..db4fa69f71 100644 --- a/configs/freescale_imx6ullevk_defconfig +++ b/configs/freescale_imx6ullevk_defconfig @@ -1,11 +1,11 @@ BR2_arm=y BR2_cortex_a7=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.10.y-1.0.0)/linux-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,linux-imx,lf-5.15.71-2.2.0)/linux-imx-lf-5.15.71-2.2.0.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="imx_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ull-14x14-evk" @@ -15,8 +15,9 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="mx6ull_14x14_evk" BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.10.y-1.0.0)/uboot-imx-lf-5.10.y-1.0.0.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,nxp-imx,uboot-imx,lf-5.15.71-2.2.0)/uboot-imx-lf-5.15.71-2.2.0.tar.gz" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMX=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y From 1d7dd1b79145a34f861d30d09750f6e988e10fd5 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 16 Feb 2023 22:25:53 +0100 Subject: [PATCH 07/66] DEVELOPERS: add Giulio Benetti to board imx6ullevk for both mainline and NXP(Freescale) versions Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index caa73698f9..599cfe6886 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1136,10 +1136,13 @@ F: package/xapian/ N: Giulio Benetti F: board/bananapi/bananapi-m2-ultra/ +F: board/freescale/imx6ullevk/ F: board/olimex/a* F: configs/amarula_vyasa_rk3288_defconfig F: configs/asus_tinker_rk3288_defconfig F: configs/bananapi_m2_ultra_defconfig +F: configs/freescale_imx6ullevk_defconfig +F: configs/imx6ullevk_defconfig F: configs/olimex_a* F: package/at/ F: package/binutils/ From 792f1975175cb995600f7e3ac092fc3c741aa096 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 20 Feb 2023 18:22:38 -0700 Subject: [PATCH 08/66] package/{rust, rust-bin}: bump to version 1.67.1 Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/rust-bin/rust-bin.hash | 252 +++++++++--------- package/rust-bin/rust-bin.mk | 2 +- ...-unsoundness-in-bootstrap-cache-code.patch | 43 --- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 5 files changed, 131 insertions(+), 174 deletions(-) delete mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d00e6342e8..11cfae5e9b 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc -sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc -sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d62ce39cfc..bb66de5ec5 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.0 +RUST_BIN_VERSION = 1.67.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch deleted file mode 100644 index 3eae34642f..0000000000 --- a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) -Signed-off-by: Sebastian Weyer ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb0788..05f25af68ea 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } - --- -2.25.1 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 2a260ca64f..1b4b08cecc 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc -sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d14ad3a3e7..814a3c1dd4 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.0 +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From 6a789cd0d1badf7f68749b304f7b2e3d9f9ca2c2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 21 Feb 2023 00:42:00 +0100 Subject: [PATCH 09/66] package/highway: bump to version 1.0.3 - Dropped patch upstreamed in: https://github.com/google/highway/commit/1cab22047a6ef750ef2bc38ad47d6e765d6d376a - Add an upstream patch, not in 1.0.3 release: https://github.com/google/highway/commit/411300d0eec10d5635cbdd064299630c507348e1 - Add a new patch, to fix armv7 builds with vfp < v4. Proposed upstream in: https://github.com/google/highway/pull/1143 - Add a comment about -DHWY_CMAKE_ARM7=OFF since the name is a bit misleading. It should better be ARMV7 or ARMV7_VFPV4. For change log since 1.0.2, see: - https://github.com/google/highway/releases/tag/1.0.3 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...Check-for-the-presence-of-sys-auxv.h.patch | 62 --------- ...Fix-compilation-for-armv7-with-gcc-8.patch | 46 +++++++ ...for-armv7-targets-with-vfp-v4-and-gc.patch | 118 ++++++++++++++++++ package/highway/highway.hash | 2 +- package/highway/highway.mk | 5 +- 5 files changed, 169 insertions(+), 64 deletions(-) delete mode 100644 package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch create mode 100644 package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch create mode 100644 package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch diff --git a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch b/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch deleted file mode 100644 index df86798613..0000000000 --- a/package/highway/0001-Check-for-the-presence-of-sys-auxv.h.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 491e3b1c2b8c44a2cfd35db117b02ef0fdf6a8e5 Mon Sep 17 00:00:00 2001 -From: Julien Olivain -Date: Wed, 23 Nov 2022 23:27:11 +0100 -Subject: [PATCH] Check for the presence of - -Not all gcc versions are providing . Checking for -HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX is not -sufficient and fail to build in some situations (it was observed for -some gcc armv7m toolchains). - -This patch adds a check for and include it only if present. - -Signed-off-by: Julien Olivain ---- - CMakeLists.txt | 3 +++ - hwy/detect_targets.h | 2 +- - hwy/targets.cc | 2 +- - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b6b14ab..df6b5ab 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,6 +84,9 @@ check_cxx_source_compiles( - HWY_RISCV - ) - -+include(CheckIncludeFile) -+check_include_file(sys/auxv.h HAVE_SYS_AUXV_H) -+ - if (HWY_ENABLE_CONTRIB) - # Glob all the traits so we don't need to modify this file when adding - # additional special cases. -diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h -index 7f7e179..f0c6f94 100644 ---- a/hwy/detect_targets.h -+++ b/hwy/detect_targets.h -@@ -392,7 +392,7 @@ - #define HWY_HAVE_RUNTIME_DISPATCH 1 - // On Arm, currently only GCC does, and we require Linux to detect CPU - // capabilities. --#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_COMPILER_GCC_ACTUAL && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #define HWY_HAVE_RUNTIME_DISPATCH 1 - #else - #define HWY_HAVE_RUNTIME_DISPATCH 0 -diff --git a/hwy/targets.cc b/hwy/targets.cc -index 2fde4db..abd6a94 100644 ---- a/hwy/targets.cc -+++ b/hwy/targets.cc -@@ -42,7 +42,7 @@ - #include - #endif // HWY_COMPILER_MSVC - --#elif HWY_ARCH_ARM && HWY_OS_LINUX -+#elif HWY_ARCH_ARM && HWY_OS_LINUX && HAVE_SYS_AUXV_H - #include - #include - #endif // HWY_ARCH_* --- -2.38.1 - diff --git a/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch new file mode 100644 index 0000000000..0634460453 --- /dev/null +++ b/package/highway/0001-Fix-compilation-for-armv7-with-gcc-8.patch @@ -0,0 +1,46 @@ +From 94cda9cc8cd12345a6dbe70e40f3119d5bf7ee78 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 10 Feb 2023 21:25:36 +0100 +Subject: [PATCH] Fix compilation for armv7 with gcc < 8 + +Highway uses the construct __attribute__((target(+neon-vfpv4)) for +Armv7. The target "+neon-vfpv4" was introduced in gcc 8, in commit [1]. +When using a gcc < 8 (for example, like [2]), compilation fails with +message: + + In file included from /build/highway-1.0.3/hwy/foreach_target.h:81:0, + from /build/highway-1.0.3/hwy/per_target.cc:20: + /build/highway-1.0.3/hwy/per_target.cc: At global scope: + /build/highway-1.0.3/hwy/per_target.cc:23:22: error: attribute(target("+neon-vfpv4")) is unknown + +This commit protects the definition of HWY_TARGET_STR only when gcc +version 8 or greater is used for armv7. + +[1] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e87afe54b86c478ae63569e51e7abb67d3fe3fce +[2] https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz + +Signed-off-by: Julien Olivain +--- + hwy/ops/set_macros-inl.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/hwy/ops/set_macros-inl.h b/hwy/ops/set_macros-inl.h +index 051dbb3..00b4b1b 100644 +--- a/hwy/ops/set_macros-inl.h ++++ b/hwy/ops/set_macros-inl.h +@@ -230,7 +230,12 @@ + // Can use pragmas instead of -march compiler flag + #if HWY_HAVE_RUNTIME_DISPATCH + #if HWY_ARCH_ARM_V7 ++#if HWY_COMPILER_GCC_ACTUAL >= 800 ++// The __attribute__((target(+neon-vfpv4)) was introduced in gcc >= 8. ++// In case we have a gcc < 8, we can still compile by keeping ++// HWY_TARGET_STR undefined. + #define HWY_TARGET_STR "+neon-vfpv4" ++#endif + #else + #define HWY_TARGET_STR "+crypto" + #endif // HWY_ARCH_ARM_V7 +-- +2.39.2 + diff --git a/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch new file mode 100644 index 0000000000..f29b385501 --- /dev/null +++ b/package/highway/0002-Fix-compilation-for-armv7-targets-with-vfp-v4-and-gc.patch @@ -0,0 +1,118 @@ +From 93d4579f90dd6ad26fd0dcda6420b3bb2fdcbc02 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Mon, 20 Feb 2023 23:22:28 +0100 +Subject: [PATCH] Fix compilation for armv7 targets with vfp < v4 and gcc >= 8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using a armv7 gcc >= 8 toolchain (like [1]) with Highway +configured with -DHWY_CMAKE_ARM7=OFF and HWY_ENABLE_CONTRIB=ON, +compilation fails with error: + + In file included from /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:33, + from /build/highway-1.0.3/hwy/highway.h:358, + from /build/highway-1.0.3/hwy/contrib/sort/shared-inl.h:104, + from /build/highway-1.0.3/hwy/contrib/sort/traits128-inl.h:27, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:23, + from /build/highway-1.0.3/hwy/foreach_target.h:81, + from /build/highway-1.0.3/hwy/contrib/sort/vqsort_128d.cc:20: + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h: In function 'void hwy::N_NEON::StoreU(Vec128, Full128, uint64_t*)': + /toolchain/lib/gcc/arm-buildroot-linux-gnueabihf/12.2.0/include/arm_neon.h:11052:1: error: inlining failed in call to 'always_inline' 'void vst1q_u64(uint64_t*, uint64x2_t)': target specific option mismatch + 11052 | vst1q_u64 (uint64_t * __a, uint64x2_t __b) + | ^~~~~~~~~ + /build/highway-1.0.3/hwy/ops/arm_neon-inl.h:2786:12: note: called from here + 2786 | vst1q_u64(unaligned, v.raw); + | ~~~~~~~~~^~~~~~~~~~~~~~~~~~ + +The same errors happen when configured with HWY_ENABLE_EXAMPLES=ON, +or from client libraries like libjxl (at other places). + +The issue is that Highway Arm NEON ops have a dependency on the +Advanced SIMD (Neon) v2 and the VFPv4 floating-point instructions. +The SIMD (Neon) v1 and VFPv3 instructions are not supported. + +There was several attempts to fix variants of this issues. +See #834 and #1032. + +HWY_NEON target is selected only if __ARM_NEON is defined. See: +https://github.com/google/highway/blob/1.0.3/hwy/detect_targets.h#L251 + +This test is not sufficient since __ARM_NEON will be predefined in +any cases when Neon is enabled (neon-vfpv3, neon-vfpv4). + +The issue is that HWY_CMAKE_ARM7=ON implies VFPv4 / NEON SIMD v2. +When setting HWY_CMAKE_ARM7=OFF, "neon-vfpv4" will not be forced, +but the code is still using intrinsics assuming VFPv4. Gcc will fail +with error because code cannot be generated for the selected +architecture. + +This issue can be avoided by adding "-DHWY_DISABLED_TARGETS=HWY_NEON" in +CXXFLAGS. The problem with this solution is that every client program will +also need to do the same. This goes against the very purpose of +"hwy/detect_targets.h". + +Technically, Armv7-a processors with VFPv4 can be detected using some +ACLE (Arm C Language Extensions [2]) predefined macros: + +Basically, we want Highway to define HWY_NEON only when the target +supports SIMDv2/VFPv4 or higher. An older target with vfpv3 only +(e.g. Cortex-A8, A9, ...) would NOT define HWY_NEON, and therefore +would fallback on HWY_SCALAR implementation. + +However, not all compiler completely support ACLE. There is also +several versions too. So we cannot easily rely on macros like +"__ARM_VFPV4__" (which clang predefine, but not gcc). + +The alternative solution proposed in this patch, is to declare the +HWY_NEON target architecture as broken, when we detect the target is +Armv7-A, but mandatory features for vfpv4 (namely half-float, FMA) +are missing. Half-floats are tested using the macro __ARM_NEON_FP, +and the FMA with the macro __ARM_FEATURE_FMA. See ACLE [2]. The +intent of declaring the target as broken, rather than selecting +HWY_NEON only if vfpv4 features are detected is to remain a bit +conservative, since the detection is slithly inaccurate. + +For a given compiler/cflags, predefined macros for Arm/ACLE can be +reviewed with commands like: + + arm-linux-gnueabihf-gcc -mcpu=cortex-a9 -mfpu=neon-vfpv3 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + arm-linux-gnueabihf-gcc -mcpu=cortex-a7 -mfpu=neon-vfpv4 -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a9 -mfpu=neon-vfpv3 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + clang -target armv7a -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -Wp,-dM -E -c - < /dev/null | grep -Fi arm | sort + +The different values of __ARM_NEON_FP can be seen, depending which +"-mfpu" is passed. Same for __ARM_FEATURE_FMA. + +[1] https://toolchains.bootlin.com/downloads/releases/toolchains/armv7-eabihf/tarballs/armv7-eabihf--glibc--bleeding-edge-2022.08-1.tar.bz2 +[2] https://github.com/ARM-software/acle/ + +Signed-off-by: Julien Olivain +--- + hwy/detect_targets.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/hwy/detect_targets.h b/hwy/detect_targets.h +index 2beca95..40ae7fe 100644 +--- a/hwy/detect_targets.h ++++ b/hwy/detect_targets.h +@@ -154,6 +154,16 @@ + (defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN)) + #define HWY_BROKEN_TARGETS (HWY_NEON) + ++// armv7-a without a detected vfpv4 is not supported ++// (for example Cortex-A8, Cortex-A9) ++// vfpv4 always have neon half-float _and_ FMA. ++#elif HWY_ARCH_ARM_V7 && \ ++ (__ARM_ARCH_PROFILE == 'A') && \ ++ !defined(__ARM_VFPV4__) && \ ++ !((__ARM_NEON_FP & 0x2 /* half-float */) && \ ++ (__ARM_FEATURE_FMA == 1)) ++#define HWY_BROKEN_TARGETS (HWY_NEON) ++ + // SVE[2] require recent clang or gcc versions. + #elif (HWY_COMPILER_CLANG && HWY_COMPILER_CLANG < 1100) || \ + (HWY_COMPILER_GCC_ACTUAL && HWY_COMPILER_GCC_ACTUAL < 1000) +-- +2.39.2 + diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3ff468443e..16a9282176 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 e8ef71236ac0d97f12d553ec1ffc5b6375d57b5f0b860c7447dd69b6ed1072db highway-1.0.2.tar.gz +sha256 566fc77315878473d9a6bd815f7de78c73734acdcb745c3dde8579560ac5440e highway-1.0.3.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE diff --git a/package/highway/highway.mk b/package/highway/highway.mk index ed7f6ca871..56d63a83f9 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.2 +HIGHWAY_VERSION = 1.0.3 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 HIGHWAY_LICENSE_FILES = LICENSE @@ -35,6 +35,9 @@ endif ifeq ($(BR2_ARM_FPU_VFPV4),y) HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=ON else +# Highway Armv7 Neon support requires in fact vfpv4 / neon v2. When we +# are in a vfpv3 case (e.g. Cortex-A8, Cortex-A9) this flag need to be +# set to off. HIGHWAY_CONF_OPTS += -DHWY_CMAKE_ARM7=OFF endif From 3927054736881e5807b86fe9b1e5b275d941d6fd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 20 Feb 2023 20:25:34 +0100 Subject: [PATCH 10/66] package/kodi-pvr-iptvsimple: bump version to 19.3.0-Matrix Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index 47dd202258..de71703c53 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c kodi-pvr-iptvsimple-19.2.2-Matrix.tar.gz +sha256 421a883054dd31ad512866236c364e5a564d7db9fa595dadc3e37b9169b7fe79 kodi-pvr-iptvsimple-19.3.0-Matrix.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index 5b91c35c0c..e5976a7d3a 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 19.2.2-Matrix +KODI_PVR_IPTVSIMPLE_VERSION = 19.3.0-Matrix 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 = LICENSE.md From 6ab0431b70e3d963ff3bbc8f10a1871d9f628789 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 20 Feb 2023 20:18:22 +0100 Subject: [PATCH 11/66] package/{mesa3d, mesa3d-headers}: bump version to 22.3.5 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 9177adceda..ad1999a30d 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 22.3.4 +MESA3D_HEADERS_VERSION = 22.3.5 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e4de997f0e..50c5bcc7fc 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2023-January/000703.html -sha256 37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593 mesa-22.3.4.tar.xz -sha512 6af340153244d3e95d0e155a45d6db134335654d62590797ae0ef6ba44c2ccfe91ebf95f70ff82c67cee108ac35536767b1f6848d6d1129f52eb9e8414ee321d mesa-22.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2023-February/000705.html +sha256 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9 mesa-22.3.5.tar.xz +sha512 a4cad9b7e6501678fac279bd88a37e522633c7128afa8df04982f469c930e3557bb1d05b4b0f5ae16704d8d04e50c90a7489943a48861df17dd947704c329b85 mesa-22.3.5.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index cf2352a355..1e919d73f2 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 22.3.4 +MESA3D_VERSION = 22.3.5 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From 07634619d9738154e46e9b309d0697d223639167 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 19 Feb 2023 23:20:47 +0100 Subject: [PATCH 12/66] package/ssdp-responder: bump to v2.0 ChangeLog: - https://github.com/troglobit/ssdp-responder/releases/tag/v2.0 - https://github.com/troglobit/ssdp-responder/blob/v2.0/ChangeLog.md Critical Fixes: - Fix periodic busy loop causing intermittent 100% CPU load - Fix invalid uuid:uuid:... in description.xml (dup uuid:) Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni --- package/ssdp-responder/ssdp-responder.hash | 2 +- package/ssdp-responder/ssdp-responder.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ssdp-responder/ssdp-responder.hash b/package/ssdp-responder/ssdp-responder.hash index 425ad86e08..8b4f3e4e45 100644 --- a/package/ssdp-responder/ssdp-responder.hash +++ b/package/ssdp-responder/ssdp-responder.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 974c244abd4ba8c87532867a84756182a1460c99072ffb1eb91c5a1f73311d89 ssdp-responder-1.9.tar.gz +sha256 d8888f2ac59febfb3b2473a1402041014052ad4dc1eeb4168c78aeca1692aae3 ssdp-responder-2.0.tar.gz sha256 68d6fdc22e337f725fe719bf9ae6d92b1d8d0ca4cff8219b303ab76706670a8d LICENSE diff --git a/package/ssdp-responder/ssdp-responder.mk b/package/ssdp-responder/ssdp-responder.mk index 5193966908..20e7219386 100644 --- a/package/ssdp-responder/ssdp-responder.mk +++ b/package/ssdp-responder/ssdp-responder.mk @@ -4,7 +4,7 @@ # ################################################################################ -SSDP_RESPONDER_VERSION = 1.9 +SSDP_RESPONDER_VERSION = 2.0 SSDP_RESPONDER_SITE = https://github.com/troglobit/ssdp-responder/releases/download/v$(SSDP_RESPONDER_VERSION) SSDP_RESPONDER_LICENSE = ISC SSDP_RESPONDER_LICENSE_FILES = LICENSE From a86bbb4ae4a6f5580e4cbfad8ecf8ebf81b6e053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 16 Feb 2023 11:07:50 +0100 Subject: [PATCH 13/66] configs/qemu_arm_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and follow CONFIG_SYS_TEXT_BASE renaming. Signed-off-by: Vincent Stehlé Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- board/qemu/arm-ebbr/u-boot.fragment | 2 +- configs/qemu_arm_ebbr_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/qemu/arm-ebbr/u-boot.fragment b/board/qemu/arm-ebbr/u-boot.fragment index bfc382cde9..66fe910f16 100644 --- a/board/qemu/arm-ebbr/u-boot.fragment +++ b/board/qemu/arm-ebbr/u-boot.fragment @@ -31,5 +31,5 @@ CONFIG_PARTITION_TYPE_GUID=y CONFIG_RNG_OPTEE=y CONFIG_RTC_EMULATION=y CONFIG_SCMI_FIRMWARE=y -CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_TEE=y +CONFIG_TEXT_BASE=0x60000000 diff --git a/configs/qemu_arm_ebbr_defconfig b/configs/qemu_arm_ebbr_defconfig index f3e2d42a54..8fbb3069bc 100644 --- a/configs/qemu_arm_ebbr_defconfig +++ b/configs/qemu_arm_ebbr_defconfig @@ -7,12 +7,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/arm-ebbr/post- BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/arm-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/linux.fragment" @@ -42,7 +42,7 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_virt" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/arm-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 2215548546af47f3cfce89a15bfc31f736cd74bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 16 Feb 2023 11:07:51 +0100 Subject: [PATCH 14/66] configs/qemu_aarch64_ebbr: bump linux to 6.1.12 and u-boot to 2023.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel version to 6.1.12. - Bump U-Boot version to 2023.01 and rename config fragment to make it clearer that it is not a complete config file. Signed-off-by: Vincent Stehlé Cc: Romain Naour Signed-off-by: Thomas Petazzoni --- .../qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} | 0 configs/qemu_aarch64_ebbr_defconfig | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename board/qemu/aarch64-ebbr/{u-boot.config => u-boot.fragment} (100%) diff --git a/board/qemu/aarch64-ebbr/u-boot.config b/board/qemu/aarch64-ebbr/u-boot.fragment similarity index 100% rename from board/qemu/aarch64-ebbr/u-boot.config rename to board/qemu/aarch64-ebbr/u-boot.fragment diff --git a/configs/qemu_aarch64_ebbr_defconfig b/configs/qemu_aarch64_ebbr_defconfig index d293ad0e60..e3157089a9 100644 --- a/configs/qemu_aarch64_ebbr_defconfig +++ b/configs/qemu_aarch64_ebbr_defconfig @@ -6,12 +6,12 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh board/qemu/aarch64-ebbr/p BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG) -c board/qemu/aarch64-ebbr/genimage.cfg" # Linux headers -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_0=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.0.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.12" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y @@ -39,9 +39,9 @@ BR2_TARGET_OPTEE_OS_PLATFORM="vexpress-qemu_armv8a" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.config" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/qemu/aarch64-ebbr/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y # Host tools From e464dc4033d0437c337e8cf0998a95c9deeeee12 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Thu, 16 Feb 2023 09:47:13 +0100 Subject: [PATCH 15/66] package/zstd: bump to version 1.5.4 The LICENSE text has changed, nominally the copyright owner changed from "Facebook" to "Meta Platforms, Inc. and affiliates", reflecting the name change of that company. Add upstream patch to fix zstd-dll build. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- ...-dll-build-missing-dependencies-3496.patch | 321 ++++++++++++++++++ package/zstd/zstd.hash | 6 +- package/zstd/zstd.mk | 2 +- 3 files changed, 325 insertions(+), 4 deletions(-) create mode 100644 package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch diff --git a/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch new file mode 100644 index 0000000000..60737159c6 --- /dev/null +++ b/package/zstd/0001-Fix-zstd-dll-build-missing-dependencies-3496.patch @@ -0,0 +1,321 @@ +From e47c7c0d5a923dcdc3b302f9944eb4a70b7ee0be Mon Sep 17 00:00:00 2001 +From: Yonatan Komornik <11005061+yoniko@users.noreply.github.com> +Date: Sun, 12 Feb 2023 12:32:31 -0800 +Subject: [PATCH] Fix zstd-dll build missing dependencies (#3496) + +* Fixes zstd-dll build (https://github.com/facebook/zstd/issues/3492): +- Adds pool.o and threading.o dependency to the zstd-dll target +- Moves custom allocation functions into header to avoid needing to add dependency on common.o +- Adds test target for zstd-dll +- Adds github workflow that buildis zstd-dll + +[nolange79: backport from upstream c78f434aa4f5f1097c8edb975f4c1635817a5a71] +Signed-off-by: Norbert Lange +--- + .github/workflows/dev-short-tests.yml | 9 +++- + contrib/linux-kernel/zstd_common_module.c | 3 -- + lib/common/allocations.h | 55 +++++++++++++++++++++++ + lib/common/pool.c | 2 +- + lib/common/zstd_common.c | 35 --------------- + lib/common/zstd_internal.h | 5 --- + lib/compress/zstd_compress.c | 1 + + lib/compress/zstd_cwksp.h | 1 + + lib/compress/zstdmt_compress.c | 1 + + lib/decompress/zstd_ddict.c | 1 + + lib/decompress/zstd_decompress.c | 1 + + programs/Makefile | 2 +- + tests/Makefile | 8 +++- + 13 files changed, 76 insertions(+), 48 deletions(-) + create mode 100644 lib/common/allocations.h + +diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml +index 132dbb99..3ae2e9da 100644 +--- a/.github/workflows/dev-short-tests.yml ++++ b/.github/workflows/dev-short-tests.yml +@@ -55,6 +55,14 @@ jobs: + run: | + make c89build V=1 + ++ build-zstd-dll: ++ runs-on: ubuntu-latest ++ steps: ++ - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3 ++ - name: build zstd bin against a dynamic lib (debuglevel for more dependencies) ++ run: | ++ make -C lib lib-mt-release ++ DEBUGLEVEL=2 make -C programs zstd-dll + + gcc-7-libzstd: + runs-on: ubuntu-latest +@@ -328,7 +336,6 @@ jobs: + make -j -C programs allVariants MOREFLAGS=-O0 + ./tests/test-variants.sh + +- + qemu-consistency: + name: QEMU ${{ matrix.name }} + runs-on: ubuntu-20.04 +diff --git a/contrib/linux-kernel/zstd_common_module.c b/contrib/linux-kernel/zstd_common_module.c +index 2fead39e..466828e3 100644 +--- a/contrib/linux-kernel/zstd_common_module.c ++++ b/contrib/linux-kernel/zstd_common_module.c +@@ -24,9 +24,6 @@ EXPORT_SYMBOL_GPL(HUF_readStats_wksp); + EXPORT_SYMBOL_GPL(ZSTD_isError); + EXPORT_SYMBOL_GPL(ZSTD_getErrorName); + EXPORT_SYMBOL_GPL(ZSTD_getErrorCode); +-EXPORT_SYMBOL_GPL(ZSTD_customMalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customCalloc); +-EXPORT_SYMBOL_GPL(ZSTD_customFree); + + MODULE_LICENSE("Dual BSD/GPL"); + MODULE_DESCRIPTION("Zstd Common"); +diff --git a/lib/common/allocations.h b/lib/common/allocations.h +new file mode 100644 +index 00000000..a3153c4b +--- /dev/null ++++ b/lib/common/allocations.h +@@ -0,0 +1,55 @@ ++/* ++ * Copyright (c) Meta Platforms, Inc. and affiliates. ++ * All rights reserved. ++ * ++ * This source code is licensed under both the BSD-style license (found in the ++ * LICENSE file in the root directory of this source tree) and the GPLv2 (found ++ * in the COPYING file in the root directory of this source tree). ++ * You may select, at your option, one of the above-listed licenses. ++ */ ++ ++/* This file provides custom allocation primitives ++ */ ++ ++#define ZSTD_DEPS_NEED_MALLOC ++#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ ++ ++#include "mem.h" /* MEM_STATIC */ ++#define ZSTD_STATIC_LINKING_ONLY ++#include "../zstd.h" /* ZSTD_customMem */ ++ ++#ifndef ZSTD_ALLOCATIONS_H ++#define ZSTD_ALLOCATIONS_H ++ ++/* custom memory allocation functions */ ++ ++MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) ++ return customMem.customAlloc(customMem.opaque, size); ++ return ZSTD_malloc(size); ++} ++ ++MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) ++{ ++ if (customMem.customAlloc) { ++ /* calloc implemented as malloc+memset; ++ * not as efficient as calloc, but next best guess for custom malloc */ ++ void* const ptr = customMem.customAlloc(customMem.opaque, size); ++ ZSTD_memset(ptr, 0, size); ++ return ptr; ++ } ++ return ZSTD_calloc(1, size); ++} ++ ++MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) ++{ ++ if (ptr!=NULL) { ++ if (customMem.customFree) ++ customMem.customFree(customMem.opaque, ptr); ++ else ++ ZSTD_free(ptr); ++ } ++} ++ ++#endif /* ZSTD_ALLOCATIONS_H */ +diff --git a/lib/common/pool.c b/lib/common/pool.c +index f3d9d085..d5ca5a78 100644 +--- a/lib/common/pool.c ++++ b/lib/common/pool.c +@@ -10,9 +10,9 @@ + + + /* ====== Dependencies ======= */ ++#include "../common/allocations.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "zstd_deps.h" /* size_t */ + #include "debug.h" /* assert */ +-#include "zstd_internal.h" /* ZSTD_customCalloc, ZSTD_customFree */ + #include "pool.h" + + /* ====== Compiler specifics ====== */ +diff --git a/lib/common/zstd_common.c b/lib/common/zstd_common.c +index 32085524..3f04c22a 100644 +--- a/lib/common/zstd_common.c ++++ b/lib/common/zstd_common.c +@@ -14,7 +14,6 @@ + * Dependencies + ***************************************/ + #define ZSTD_DEPS_NEED_MALLOC +-#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ + #include "error_private.h" + #include "zstd_internal.h" + +@@ -47,37 +46,3 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); } + /*! ZSTD_getErrorString() : + * provides error code string from enum */ + const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); } +- +- +- +-/*=************************************************************** +-* Custom allocator +-****************************************************************/ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) +- return customMem.customAlloc(customMem.opaque, size); +- return ZSTD_malloc(size); +-} +- +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) +-{ +- if (customMem.customAlloc) { +- /* calloc implemented as malloc+memset; +- * not as efficient as calloc, but next best guess for custom malloc */ +- void* const ptr = customMem.customAlloc(customMem.opaque, size); +- ZSTD_memset(ptr, 0, size); +- return ptr; +- } +- return ZSTD_calloc(1, size); +-} +- +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) +-{ +- if (ptr!=NULL) { +- if (customMem.customFree) +- customMem.customFree(customMem.opaque, ptr); +- else +- ZSTD_free(ptr); +- } +-} +diff --git a/lib/common/zstd_internal.h b/lib/common/zstd_internal.h +index 37836dc7..1f942f27 100644 +--- a/lib/common/zstd_internal.h ++++ b/lib/common/zstd_internal.h +@@ -350,11 +350,6 @@ typedef struct { + const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */ + int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */ + +-/* custom memory allocation functions */ +-void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem); +-void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem); +-void ZSTD_customFree(void* ptr, ZSTD_customMem customMem); +- + + /* ZSTD_invalidateRepCodes() : + * ensures next compression will not use repcodes from previous block. +diff --git a/lib/compress/zstd_compress.c b/lib/compress/zstd_compress.c +index b55f684c..173ce242 100644 +--- a/lib/compress/zstd_compress.c ++++ b/lib/compress/zstd_compress.c +@@ -11,6 +11,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* INT_MAX, ZSTD_memset, ZSTD_memcpy */ + #include "../common/mem.h" + #include "hist.h" /* HIST_countFast_wksp */ +diff --git a/lib/compress/zstd_cwksp.h b/lib/compress/zstd_cwksp.h +index 97676693..9113cdbd 100644 +--- a/lib/compress/zstd_cwksp.h ++++ b/lib/compress/zstd_cwksp.h +@@ -14,6 +14,7 @@ + /*-************************************* + * Dependencies + ***************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_internal.h" + + #if defined (__cplusplus) +diff --git a/lib/compress/zstdmt_compress.c b/lib/compress/zstdmt_compress.c +index 7a2c7172..bf2de4a7 100644 +--- a/lib/compress/zstdmt_compress.c ++++ b/lib/compress/zstdmt_compress.c +@@ -20,6 +20,7 @@ + + + /* ====== Dependencies ====== */ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset, INT_MAX, UINT_MAX */ + #include "../common/mem.h" /* MEM_STATIC */ + #include "../common/pool.h" /* threadpool */ +diff --git a/lib/decompress/zstd_ddict.c b/lib/decompress/zstd_ddict.c +index ad5c34a7..309ec0d0 100644 +--- a/lib/decompress/zstd_ddict.c ++++ b/lib/decompress/zstd_ddict.c +@@ -14,6 +14,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/cpu.h" /* bmi2 */ + #include "../common/mem.h" /* low level memory routines */ +diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c +index d487966c..3f3ca57c 100644 +--- a/lib/decompress/zstd_decompress.c ++++ b/lib/decompress/zstd_decompress.c +@@ -55,6 +55,7 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ ++#include "../common/allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */ + #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */ + #include "../common/mem.h" /* low level memory routines */ + #define FSE_STATIC_LINKING_ONLY +diff --git a/programs/Makefile b/programs/Makefile +index fcff41dc..8507abef 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -225,7 +225,7 @@ zstd-noxz : zstd + .PHONY: zstd-dll + zstd-dll : LDFLAGS+= -L$(LIBZSTD) + zstd-dll : LDLIBS += -lzstd +-zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c ++zstd-dll : ZSTDLIB_LOCAL_SRC = xxhash.c pool.c threading.c + zstd-dll : zstd + + +diff --git a/tests/Makefile b/tests/Makefile +index 3eed19ea..778c7d67 100644 +--- a/tests/Makefile ++++ b/tests/Makefile +@@ -95,7 +95,7 @@ allnothread: fullbench fuzzer paramgrill datagen decodecorpus + dll: fuzzer-dll zstreamtest-dll + + .PHONY: zstd zstd32 zstd-nolegacy # only external makefile knows how to build or update them +-zstd zstd32 zstd-nolegacy: ++zstd zstd32 zstd-nolegacy zstd-dll: + $(MAKE) -C $(PRGDIR) $@ MOREFLAGS+="$(DEBUGFLAGS)" + + .PHONY: libzstd +@@ -328,13 +328,17 @@ test-all: test test32 test-decodecorpus-cli + test-zstd: ZSTD = $(PRGDIR)/zstd + test-zstd: zstd + ++.PHONY: test-zstd-dll ++test-zstd-dll: ZSTD = $(PRGDIR)/zstd ++test-zstd-dll: zstd-dll ++ + test-zstd32: ZSTD = $(PRGDIR)/zstd32 + test-zstd32: zstd32 + + test-zstd-nolegacy: ZSTD = $(PRGDIR)/zstd-nolegacy + test-zstd-nolegacy: zstd-nolegacy + +-test-zstd test-zstd32 test-zstd-nolegacy: datagen ++test-zstd test-zstd32 test-zstd-nolegacy test-zstd-dll: datagen + file $(ZSTD) + EXE_PREFIX="$(QEMU_SYS)" ZSTD_BIN="$(ZSTD)" DATAGEN_BIN=./datagen ./playTests.sh $(ZSTDRTTEST) + +-- +2.39.1 + diff --git a/package/zstd/zstd.hash b/package/zstd/zstd.hash index eca44b89f0..ca4e2fa0b9 100644 --- a/package/zstd/zstd.hash +++ b/package/zstd/zstd.hash @@ -1,6 +1,6 @@ -# From https://github.com/facebook/zstd/releases/download/v1.5.2/zstd-1.5.2.tar.gz.sha256 -sha256 7c42d56fac126929a6a85dbc73ff1db2411d04f104fae9bdea51305663a83fd0 zstd-1.5.2.tar.gz +# From https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz.sha256 +sha256 0f470992aedad543126d06efab344dc5f3e171893810455787d38347343a4424 zstd-1.5.4.tar.gz # License files (locally computed) -sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE +sha256 7055266497633c9025b777c78eb7235af13922117480ed5c674677adc381c9d8 LICENSE sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 73bb97a793..45e8bf1bc2 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZSTD_VERSION = 1.5.2 +ZSTD_VERSION = 1.5.4 ZSTD_SITE = https://github.com/facebook/zstd/releases/download/v$(ZSTD_VERSION) ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 From e3706f1e0b7008674169809166c414825a551d04 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Mon, 13 Feb 2023 13:40:23 +0100 Subject: [PATCH 16/66] package/network-manager: bump version to 1.42.0 Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- package/network-manager/network-manager.hash | 4 ++-- package/network-manager/network-manager.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 3895c1ffc3..270699d63a 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.40/NetworkManager-1.40.10.sha256sum -sha256 fa251455df3c38e2bf1e1ff806b4bc4346938dd135a3568bd250e92caa85eaf7 NetworkManager-1.40.10.tar.xz +# From https://download.gnome.org/sources/NetworkManager/1.42/NetworkManager-1.42.0.sha256sum +sha256 2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4 NetworkManager-1.42.0.tar.xz # Locally computed sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 138ff46e4a..3001530930 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.40 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).10 +NETWORK_MANAGER_VERSION_MAJOR = 1.42 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).0 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 From b851097ba6db559042183eb31dc48dc1533fac04 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Mon, 13 Feb 2023 16:10:39 +0100 Subject: [PATCH 17/66] package/networkd-dispatcher: bump to version 2.2.4 Signed-off-by: Michael Nosthoff Signed-off-by: Thomas Petazzoni --- package/networkd-dispatcher/networkd-dispatcher.hash | 2 +- package/networkd-dispatcher/networkd-dispatcher.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/networkd-dispatcher/networkd-dispatcher.hash b/package/networkd-dispatcher/networkd-dispatcher.hash index ffb4fa846a..f50dd75163 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.hash +++ b/package/networkd-dispatcher/networkd-dispatcher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 61270b4c2f39c36da4b0a62724a3cc01f6732493fed0f166ee675bafedff11df networkd-dispatcher-2.2.3.tar.bz2 +sha256 993086fa2dab11ba6b54a121adaccbd4c679ce3c8b3193cfa5c00500c28cbdf9 networkd-dispatcher-2.2.4.tar.bz2 sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/networkd-dispatcher/networkd-dispatcher.mk b/package/networkd-dispatcher/networkd-dispatcher.mk index 2b1aa257ce..a3e0319c10 100644 --- a/package/networkd-dispatcher/networkd-dispatcher.mk +++ b/package/networkd-dispatcher/networkd-dispatcher.mk @@ -4,7 +4,7 @@ # ################################################################################ -NETWORKD_DISPATCHER_VERSION = 2.2.3 +NETWORKD_DISPATCHER_VERSION = 2.2.4 NETWORKD_DISPATCHER_SOURCE = networkd-dispatcher-$(NETWORKD_DISPATCHER_VERSION).tar.bz2 NETWORKD_DISPATCHER_SITE = https://gitlab.com/craftyguy/networkd-dispatcher/-/archive/$(NETWORKD_DISPATCHER_VERSION) NETWORKD_DISPATCHER_LICENSE = GPL-3.0 From db97a1d196da07d2c1d1f41061dcac851c110915 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 14 Feb 2023 13:25:41 -0700 Subject: [PATCH 18/66] package/python-maturin: bump to version 0.14.13 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-maturin/python-maturin.hash | 2 +- package/python-maturin/python-maturin.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-maturin/python-maturin.hash b/package/python-maturin/python-maturin.hash index b104b1fbbe..d1344f2744 100644 --- a/package/python-maturin/python-maturin.hash +++ b/package/python-maturin/python-maturin.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 59157a06c0a482aec750d64746f2b23e556ce3ec62d9cdce74fcb7b4658b722b maturin-0.14.9.tar.gz +sha256 7ed1234824ef2b0c919c6d24550540bf044fe992612b322a6abda1253f5bb500 maturin-0.14.13.tar.gz # Locally computed sha256 checksums sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 license-apache sha256 ea7882c559733766ad08343bde1d1ec80a4967c03a738fb8e0058ef6289f7b7c license-mit diff --git a/package/python-maturin/python-maturin.mk b/package/python-maturin/python-maturin.mk index 3484e09d22..7781a1070b 100644 --- a/package/python-maturin/python-maturin.mk +++ b/package/python-maturin/python-maturin.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATURIN_VERSION = 0.14.9 +PYTHON_MATURIN_VERSION = 0.14.13 PYTHON_MATURIN_SOURCE = maturin-$(PYTHON_MATURIN_VERSION).tar.gz -PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/90/f9/f4242c0e8bc5def9a7135c12574449dbb411ecc595cf72202ca97a79c2ad +PYTHON_MATURIN_SITE = https://files.pythonhosted.org/packages/a9/a9/bcff9592d7ad68052432e6369bd310606e2ddeb9bcc0b52d5f69e4140290 PYTHON_MATURIN_SETUP_TYPE = setuptools PYTHON_MATURIN_LICENSE = Apache-2.0 or MIT PYTHON_MATURIN_LICENSE_FILES = license-apache license-mit From ec7258f3f4ea4442cd1f8c78a066a062a4d0cbd0 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 7 Feb 2023 23:09:38 +0100 Subject: [PATCH 19/66] package/openmpi: bump to version 4.1.4 Notable changes in this commit: - change from v4.0.x to v4.1.x "current" version series, - move the sha256 hash out of the "Locally computed" section, as the value comes from the download page, - the LICENSE file hash changed, as the file was updated (copyright years updated and new contributors added), - the IME (Infinite Memory Engine), introduced in v4.1.x, is disabled to workaround a failure when cross-compiled, - the package now requires a toolchain with atomic support, and needs to link against libatomic when needed. For change log since v4.0.0, see: - https://github.com/open-mpi/ompi/blob/v4.1.4/NEWS#L61 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openmpi/Config.in | 2 ++ package/openmpi/openmpi.hash | 10 +++++----- package/openmpi/openmpi.mk | 17 ++++++++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/package/openmpi/Config.in b/package/openmpi/Config.in index 4413c55f9c..e64eb81c3e 100644 --- a/package/openmpi/Config.in +++ b/package/openmpi/Config.in @@ -1,5 +1,6 @@ comment "openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++" depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_sparc depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP @@ -8,6 +9,7 @@ config BR2_PACKAGE_OPENMPI bool "openmpi" depends on BR2_USE_MMU # fork() depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS # dlfcn.h diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index a399adc758..745ed7c580 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ -# From: https://www.open-mpi.org/software/ompi/v4.0/ -md5 e3da67df1e968c8798827e0e5fe9a510 openmpi-4.0.0.tar.bz2 -sha1 fee1d0287abfb150bae16957de342752c9bdd4e8 openmpi-4.0.0.tar.bz2 +# From: https://www.open-mpi.org/software/ompi/v4.1/ +md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 +sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 +sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 # Locally computed -sha256 2f0b8a36cfeb7354b45dda3c5425ef8393c9b04115570b615213faaa3f97366b openmpi-4.0.0.tar.bz2 -sha256 8298a80ed5f09cfd007bae1c0e7d67d1c2810c6389876778dad070c31a691dac LICENSE +sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index 8bdc3fa188..f14b55ced5 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -4,14 +4,21 @@ # ################################################################################ -OPENMPI_VERSION_MAJOR = 4.0 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).0 +OPENMPI_VERSION_MAJOR = 4.1 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause OPENMPI_LICENSE_FILES = LICENSE OPENMPI_INSTALL_STAGING = YES +# The macro searching for IME (Infinite Memory Engine) filesystem +# brings "-I/usr/local/include" in the CPPFLAGS, even if not +# found. This makes the configuration fail. See: +# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# Disable explicitly to avoid the issue. +OPENMPI_CONF_OPTS = --without-ime + # Enabling Fortran support requires pre-seeding the configure script # with various values that cannot be guessed, so we provide cache # files for various architectures. @@ -43,6 +50,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) OPENMPI_CFLAGS += -O0 endif -OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +OPENMPI_LIBS += -latomic +endif + +OPENMPI_CONF_ENV = CFLAGS="$(OPENMPI_CFLAGS)" LIBS="$(OPENMPI_LIBS)" $(eval $(autotools-package)) From f6c05b47f71a6e140a0743dda276267f653f94f3 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 17:10:36 -0700 Subject: [PATCH 20/66] package/cmake: disable ccache for host-cmake The upcoming ccache update will depend on host-cmake, so we must ensure host-cmake doesn't use ccache when being built. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/cmake/cmake.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 053658fad6..dc92c8bb4e 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -40,9 +40,16 @@ CMAKE_CONF_OPTS = \ HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") +# We may be a ccache dependency, so we can't use ccache +HOST_CMAKE_CONFIGURE_OPTS = \ + $(HOST_CONFIGURE_OPTS) \ + CC="$(HOSTCC_NOCCACHE)" \ + GCC="$(HOSTCC_NOCCACHE)" \ + CXX="$(HOSTCXX_NOCCACHE)" + define HOST_CMAKE_CONFIGURE_CMDS (cd $(@D); \ - $(HOST_CONFIGURE_OPTS) \ + $(HOST_CMAKE_CONFIGURE_OPTS) \ CFLAGS="$(HOST_CMAKE_CFLAGS)" \ ./bootstrap --prefix=$(HOST_DIR) \ --parallel=$(PARALLEL_JOBS) -- \ From 7087e5286d8419f4625f5f6e52aa84567c6b7ed0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 8 Jan 2023 17:10:37 -0700 Subject: [PATCH 21/66] package/ccache: bump to version 4.7.4 Migrate to cmake package infrastructure. Add new host-hiredis host-zstd dependencies. Add new ccache dependency exclusions to pkg-generic. Migrate HOST_CCACHE_PATCH_CONFIGURATION to handle updated source files/format. License hashes changed due to migrating urls to https: https://github.com/ccache/ccache/commit/a0f32f161f1b8b9c5d287ca8abe88e3fd1e940a2 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/ccache/ccache.hash | 6 +++--- package/ccache/ccache.mk | 38 +++++++++++++++++--------------------- package/pkg-generic.mk | 2 +- 3 files changed, 21 insertions(+), 25 deletions(-) diff --git a/package/ccache/ccache.hash b/package/ccache/ccache.hash index 16cfad602c..9b11f026ec 100644 --- a/package/ccache/ccache.hash +++ b/package/ccache/ccache.hash @@ -1,4 +1,4 @@ # sha256 computed locally -sha256 a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400 ccache-3.7.12.tar.xz -sha256 ec6b1a326ff93b2cc21df88a697ae470ff6927a55b8929e7e491b315e1563361 GPL-3.0.txt -sha256 4f63223bcdee822d55a6768cc8399ffe06401d7a03cfe79e1dc305f50dc22c59 LICENSE.adoc +sha256 df0c64d15d3efaf0b4f6837dd6b1467e40eeaaa807db25ce79c3a08a46a84e36 ccache-4.7.4.tar.xz +sha256 80b5112739a423dfac7bed1ca8a1df3cccda3d794425441997d4462b83db4dd5 GPL-3.0.txt +sha256 56cf64f68b7b8150300acd79899941615523ea5c56c120e92f5b175b7cc78e3c LICENSE.adoc diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index 97aa8b1c75..6b7d57b40c 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -4,27 +4,19 @@ # ################################################################################ -CCACHE_VERSION = 3.7.12 +CCACHE_VERSION = 4.7.4 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 - -# Force ccache to use its internal zlib. The problem is that without -# this, ccache would link against the zlib of the build system, but we -# might build and install a different version of zlib in $(O)/host -# afterwards, which ccache will pick up. This might break if there is -# a version mismatch. A solution would be to add host-zlib has a -# dependency of ccache, but it would require tuning the zlib .mk file -# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy -# path: tell ccache to use its internal copy of zlib, so that ccache -# has zero dependency besides the C library. -HOST_CCACHE_CONF_OPTS += --with-bundled-zlib +HOST_CCACHE_DEPENDENCIES = host-hiredis host-zstd # We are ccache, so we can't use ccache -HOST_CCACHE_CONF_ENV = \ - CC="$(HOSTCC_NOCCACHE)" \ - CXX="$(HOSTCXX_NOCCACHE)" +HOST_CCACHE_CONF_OPTS += \ + -UCMAKE_C_COMPILER_LAUNCHER \ + -UCMAKE_CXX_COMPILER_LAUNCHER \ + -DZSTD_FROM_INTERNET=OFF \ + -DHIREDIS_FROM_INTERNET=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR @@ -33,13 +25,17 @@ HOST_CCACHE_CONF_ENV = \ # BR2_CCACHE_DIR. # - Change hard-coded last-ditch default to match path in .config, to avoid # the need to specify BR_CACHE_DIR when invoking ccache directly. -# CCache replaces "%s" with the home directory of the current user, -# So rewrite BR_CACHE_DIR to take that into consideration for SDK purpose -HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR)) +# CCache replaces "home_dir" with the home directory of the current user, +# so rewrite BR_CACHE_DIR to take that into consideration for SDK purpose +HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,%,$(BR_CACHE_DIR)) define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/ccache.c - sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/conf.c + sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/src/Config.cpp + sed -i 's,".ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,"/.cache/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,"/.config/ccache","/$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/src/Config.cpp + sed -i 's,getenv("XDG_CACHE_HOME"),nullptr,' $(@D)/src/Config.cpp + sed -i 's,getenv("XDG_CONFIG_HOME"),nullptr,' $(@D)/src/Config.cpp endef HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION @@ -62,7 +58,7 @@ endef HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_DO_INITIAL_SETUP endif -$(eval $(host-autotools-package)) +$(eval $(host-cmake-package)) ifeq ($(BR2_CCACHE),y) ccache-stats: host-ccache diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 82187d7db9..d460251f48 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -792,7 +792,7 @@ $(2)_EXTRACT_DEPENDENCIES += \ endif ifeq ($$(BR2_CCACHE),y) -ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-hiredis host-pkgconf host-zstd,$(1)),) +ifeq ($$(filter host-tar host-skeleton host-xz host-lzip host-fakedate host-ccache host-cmake host-hiredis host-pkgconf host-zstd,$(1)),) $(2)_DEPENDENCIES += host-ccache endif endif From 0fd1f8a892a89d1b6d27b8e9884d645f71192813 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Tue, 21 Feb 2023 18:27:16 +0100 Subject: [PATCH 22/66] package/openfpgaloader: bump to version 0.10.0 Also adds libgpiod support. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/openfpgaloader/Config.in | 10 ++++++++++ package/openfpgaloader/openfpgaloader.hash | 2 +- package/openfpgaloader/openfpgaloader.mk | 9 ++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 054278c256..4ba01d12d3 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -24,6 +24,16 @@ config BR2_PACAKGE_OPENFPGALOADER_CMSIS comment "openfpgaloader CMSIS-DAP needs udev /dev management and a toolchain w/ NPTL threads" depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS_NPTL +config BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD + bool "libgpiod support" + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 # libgpiod + select BR2_PACKAGE_LIBGPIOD + help + openfpgaloader libgpiod support + +comment "openfpgaloader libgpiod needs kernel headers >= 4.8" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 + endif comment "openfpgaloader needs a toolchain w/ threads, C++, gcc >= 4.9" diff --git a/package/openfpgaloader/openfpgaloader.hash b/package/openfpgaloader/openfpgaloader.hash index 6c9d8a2b91..a8b537782c 100644 --- a/package/openfpgaloader/openfpgaloader.hash +++ b/package/openfpgaloader/openfpgaloader.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23 openfpgaloader-0.6.1.tar.gz +sha256 966b4629df86b1d520ddd8a4e0a3fc00060b26b5ab4e172b596bd9d4659a196e openfpgaloader-0.10.0.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 0c39aad687..042b16612e 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENFPGALOADER_VERSION = 0.6.1 +OPENFPGALOADER_VERSION = 0.10.0 OPENFPGALOADER_SITE = $(call github,trabucayre,openFPGALoader,v$(OPENFPGALOADER_VERSION)) OPENFPGALOADER_LICENSE = Apache-2.0 OPENFPGALOADER_LICENSE_FILES = LICENSE @@ -24,4 +24,11 @@ else OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF endif +ifeq ($(BR2_PACAKGE_OPENFPGALOADER_LIBGPIOD),y) +OPENFPGALOADER_DEPENDENCIES += libgpiod +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON +else +OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=OFF +endif + $(eval $(cmake-package)) From 48d9042e5d2e0bc8bd0efc3a2516b156c4b89190 Mon Sep 17 00:00:00 2001 From: Casey Reeves Date: Thu, 19 Jan 2023 19:50:40 +0100 Subject: [PATCH 23/66] boot/arm-trusted-firmware: allow using Barebox as BL33 Since version 2022.04.0, Barebox now supports a generic image built for platforms, to be used as BL33 to generate FIP images. This patch makes it available as a choice of BL33 to be used with ATF and is based on the similar work put into U-Boot as BL33. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 21 +++++++++++++++++++ .../arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 27 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index a9b9bbcc5a..cb54c6c9d8 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -129,6 +129,27 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE endchoice +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + bool "Use Barebox as BL33" + depends on BR2_TARGET_BAREBOX + help + This option allows to embed the Barebox generic BL33 image in + the ARM Trusted Firmware. It ensures that the Barebox package + gets built before ATF, and that the appropriate BL33 + variable pointing to the generic bl33 image is passed + when building ATF. + +if BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33 + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE + string "Barebox BL33 image name" + default "*-generic-bl33.img" + help + Name of the Barebox BL33 image to include in ATF, it must + have been installed to BINARIES_DIR by the Barebox package. + +endif + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 1164c81410..648f62ed85 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -105,6 +105,12 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee endif endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_AS_BL33),y) +ARM_TRUSTED_FIRMWARE_BAREBOX_BIN = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BAREBOX_BL33_IMAGE)) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/$(ARM_TRUSTED_FIRMWARE_BAREBOX_BIN) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += barebox +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33),y) ARM_TRUSTED_FIRMWARE_DEPENDENCIES += edk2 # Since the flash device name vary between platforms, we use the variable From 7692d5beb2d9e4d0b463f0f26a177829e5bcc1ec Mon Sep 17 00:00:00 2001 From: AndreiCherniaev Date: Mon, 9 Jan 2023 16:33:52 +0900 Subject: [PATCH 24/66] boot/grub2: add details on grub.cfg location Signed-off-by: AndreiCherniaev Signed-off-by: Thomas Petazzoni --- boot/grub2/Config.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in index 92b5dd501b..f05f33ccc7 100644 --- a/boot/grub2/Config.in +++ b/boot/grub2/Config.in @@ -27,6 +27,10 @@ config BR2_TARGET_GRUB2 Amongst others, GRUB2 offers EFI support, which GRUB Legacy doesn't provide. + The file boot/grub2/grub.cfg is used by default as the Grub + configuration file. It can be overridden using a rootfs + overlay or post-build script. + For additional notes on using Grub 2 with Buildroot, see boot/grub2/readme.txt From 9793454bd2f0ada2b3928896aaf90b4d753d0399 Mon Sep 17 00:00:00 2001 From: Diego Hurtado de Mendoza Date: Wed, 22 Feb 2023 10:49:16 +0100 Subject: [PATCH 25/66] package/hackrf: bump to version 2023.01.1 https://github.com/greatscottgadgets/hackrf/releases/tag/v2023.01.1 Signed-off-by: Diego Hurtado de Mendoza Signed-off-by: Thomas Petazzoni --- package/hackrf/hackrf.hash | 2 +- package/hackrf/hackrf.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hackrf/hackrf.hash b/package/hackrf/hackrf.hash index 16ccb9dcfb..0426009dd3 100644 --- a/package/hackrf/hackrf.hash +++ b/package/hackrf/hackrf.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bacd4e7937467ffa14654624444c8b5c716ab470d8c1ee8d220d2094ae2adb3e hackrf-2022.09.1.tar.xz +sha256 32a03f943a30be4ba478e94bf69f14a5b7d55be6761007f4a4f5453418206a11 hackrf-2023.01.1.tar.xz sha256 49b60a6288f90f49074228cc1fae0fb16871ba36b756013abdf7c2fc92f01fad COPYING diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index 4317da60bc..0d7533815d 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -4,7 +4,7 @@ # ################################################################################ -HACKRF_VERSION = 2022.09.1 +HACKRF_VERSION = 2023.01.1 HACKRF_SITE = https://github.com/greatscottgadgets/hackrf/releases/download/v$(HACKRF_VERSION) HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz HACKRF_LICENSE = GPL-2.0+, BSD-3-Clause From 8beed8ac56a51d4d6a9dd81b81b8025cb7f8d99b Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 29 Dec 2022 19:45:20 +0100 Subject: [PATCH 26/66] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1 Drop local patch since it's been merged[0]. [0]: https://github.com/clnhub/rtl8192eu-linux/pull/69 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- ...e-due-to-redefition-of-local-sha256-.patch | 108 ------------------ package/rtl8192eu/rtl8192eu.hash | 2 +- package/rtl8192eu/rtl8192eu.mk | 2 +- 3 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch diff --git a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch deleted file mode 100644 index 52ef8c9005..0000000000 --- a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 1f968bd58656f200347bd398b34aa9f1b6393302 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 28 Dec 2022 18:54:48 +0100 -Subject: [PATCH] Fix build failure due to redefition of local sha256 data - types and functions - -Linux provides sha256_init() and 'struct sha256_state' in file -include/crypto/sha2.h so this leads to a build failure due to redefinition. -To avoid this let's prepend to all local exposed functions and data types -rtl_. sha256_process() and sha256_done() are not required to be renamed but -let's change them for consistency. - -[Upstream status: https://github.com/clnhub/rtl8192eu-linux/pull/69] -Signed-off-by: Giulio Benetti ---- - core/crypto/sha256-internal.c | 16 ++++++++-------- - core/crypto/sha256_i.h | 8 ++++---- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/core/crypto/sha256-internal.c b/core/crypto/sha256-internal.c -index 4d61cb1..537bb2e 100644 ---- a/core/crypto/sha256-internal.c -+++ b/core/crypto/sha256-internal.c -@@ -26,17 +26,17 @@ - int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len, - u8 *mac) - { -- struct sha256_state ctx; -+ struct rtl_sha256_state ctx; - size_t i; - - if (TEST_FAIL()) - return -1; - -- sha256_init(&ctx); -+ rtl_sha256_init(&ctx); - for (i = 0; i < num_elem; i++) -- if (sha256_process(&ctx, addr[i], len[i])) -+ if (rtl_sha256_process(&ctx, addr[i], len[i])) - return -1; -- if (sha256_done(&ctx, mac)) -+ if (rtl_sha256_done(&ctx, mac)) - return -1; - return 0; - } -@@ -82,7 +82,7 @@ static const unsigned long K[64] = { - #endif - - /* compress 512-bits */ --static int sha256_compress(struct sha256_state *md, unsigned char *buf) -+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf) - { - u32 S[8], W[64], t0, t1; - u32 t; -@@ -125,7 +125,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) - - - /* Initialize the hash state */ --void sha256_init(struct sha256_state *md) -+void rtl_sha256_init(struct rtl_sha256_state *md) - { - md->curlen = 0; - md->length = 0; -@@ -146,7 +146,7 @@ void sha256_init(struct sha256_state *md) - @param inlen The length of the data (octets) - @return CRYPT_OK if successful - */ --int sha256_process(struct sha256_state *md, const unsigned char *in, -+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, - unsigned long inlen) - { - unsigned long n; -@@ -186,7 +186,7 @@ int sha256_process(struct sha256_state *md, const unsigned char *in, - @param out [out] The destination of the hash (32 bytes) - @return CRYPT_OK if successful - */ --int sha256_done(struct sha256_state *md, unsigned char *out) -+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out) - { - int i; - -diff --git a/core/crypto/sha256_i.h b/core/crypto/sha256_i.h -index a502d2b..93a8858 100644 ---- a/core/crypto/sha256_i.h -+++ b/core/crypto/sha256_i.h -@@ -11,15 +11,15 @@ - - #define SHA256_BLOCK_SIZE 64 - --struct sha256_state { -+struct rtl_sha256_state { - u64 length; - u32 state[8], curlen; - u8 buf[SHA256_BLOCK_SIZE]; - }; - --void sha256_init(struct sha256_state *md); --int sha256_process(struct sha256_state *md, const unsigned char *in, -+void rtl_sha256_init(struct rtl_sha256_state *md); -+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in, - unsigned long inlen); --int sha256_done(struct sha256_state *md, unsigned char *out); -+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out); - - #endif /* SHA256_I_H */ --- -2.34.1 - diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash index 0cb9961345..2d6498f19d 100644 --- a/package/rtl8192eu/rtl8192eu.hash +++ b/package/rtl8192eu/rtl8192eu.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 827e9592336744cbcfca5de988d8f4e14a62690302d3cabf72aa4bedebded2b7 rtl8192eu-94bce7798bbb18de6d8b1646dedb2511f24867d3.tar.gz +sha256 72d1d97c6d2038885e5666f3271609b4dcbe45633c19a5606dc59745ff8ab543 rtl8192eu-865656c3a1d1aee8c4ba459ce7608756d17c712f.tar.gz diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk index d967db90b8..da6fe42e99 100644 --- a/package/rtl8192eu/rtl8192eu.mk +++ b/package/rtl8192eu/rtl8192eu.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3 +RTL8192EU_VERSION = 865656c3a1d1aee8c4ba459ce7608756d17c712f RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION)) RTL8192EU_LICENSE = GPL-2.0 From 97c40266b1b69e101ce035c8aa73bf2665c5c256 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 1 Jan 2023 15:32:32 +0100 Subject: [PATCH 27/66] package/qemu: add option to install blobs Binary blobs are BIOS of some sorts for the various machines emulated by QEMU. There is no option to individually install blobs; it's an all-or-nothing option. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in | 11 +++++++++++ package/qemu/qemu.mk | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 154b98a541..a446c0cf68 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -58,6 +58,17 @@ config BR2_PACKAGE_QEMU_SYSTEM if BR2_PACKAGE_QEMU_SYSTEM +config BR2_PACKAGE_QEMU_BLOBS + bool "Install binary blobs" + default y + help + Say 'y' here (the default) to install binary blobs (such as + BIOS or firmwares for the different machines simulated by + QEMU). Say 'n' to not install those blobs. + + Note: Some machines may be unbootable without those blobs. + If unsure, say 'y'. + config BR2_PACKAGE_QEMU_SLIRP bool "Enable user mode networking (SLIRP)" select BR2_PACKAGE_SLIRP diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 58b4ff10a5..d514a2285c 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -246,6 +246,12 @@ ifeq ($(BR2_STATIC_LIBS),y) QEMU_OPTS += --static endif +ifeq ($(BR2_PACKAGE_QEMU_BLOBS),y) +QEMU_OPTS += --enable-install-blobs +else +QEMU_OPTS += --disable-install-blobs +endif + # Override CPP, as it expects to be able to call it like it'd # call the compiler. define QEMU_CONFIGURE_CMDS From f78c5cb5cae93a9e63dad4361d78e1787759382f Mon Sep 17 00:00:00 2001 From: Raphael Pavlidis Date: Sat, 24 Dec 2022 18:19:20 +0100 Subject: [PATCH 28/66] package/shadow: new package shadow provides utilities to deal with user accounts. The shadow package includes the necessary programs for converting UNIX password files to the shadow password format, plus programs for managing user and group accounts. Especially it is useful if rootless podman container should be used, which requires newuidmap and newgidmap. Co-authored-by: Nicolas Carrier [Nicolas.Carrier@orolia.com provided the test case] Signed-off-by: Raphael Pavlidis Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/shadow/Config.in | 62 +++++++++ package/shadow/shadow.hash | 3 + package/shadow/shadow.mk | 135 +++++++++++++++++++ support/testing/tests/package/test_shadow.py | 55 ++++++++ 6 files changed, 257 insertions(+) create mode 100644 package/shadow/Config.in create mode 100644 package/shadow/shadow.hash create mode 100644 package/shadow/shadow.mk create mode 100644 support/testing/tests/package/test_shadow.py diff --git a/DEVELOPERS b/DEVELOPERS index 599cfe6886..d052e59122 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2429,6 +2429,7 @@ F: support/testing/tests/package/test_python_rsa.py F: support/testing/tests/package/test_python_s3transfer.py N: Raphael Pavlidis +F: package/shadow/ F: package/slirp4netns/ F: package/sway/ F: package/x11r7/xwayland/ diff --git a/package/Config.in b/package/Config.in index 6c5238a9b0..7c32305129 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2701,6 +2701,7 @@ menu "System tools" source "package/sdbus-cpp/Config.in" source "package/sdbusplus/Config.in" source "package/seatd/Config.in" + source "package/shadow/Config.in" source "package/smack/Config.in" source "package/start-stop-daemon/Config.in" source "package/supervisor/Config.in" diff --git a/package/shadow/Config.in b/package/shadow/Config.in new file mode 100644 index 0000000000..e3580c2cf5 --- /dev/null +++ b/package/shadow/Config.in @@ -0,0 +1,62 @@ +menuconfig BR2_PACKAGE_SHADOW + bool "shadow" + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + help + Utilities to deal with user accounts. + + https://github.com/shadow-maint/shadow + +if BR2_PACKAGE_SHADOW + +config BR2_PACKAGE_SHADOW_SHADOWGRP + bool "shadowgrp" + help + Enable shadow group support. + +config BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID + bool "account-tools-setuid" + depends on BR2_USE_MMU # linux-pam + depends on BR2_ENABLE_LOCALE # linux-pam + depends on BR2_USE_WCHAR # linux-pam + depends on !BR2_STATIC_LIBS # linux-pam + select BR2_PACKAGE_LINUX_PAM + help + Install the user and group management tools (e.g. groupadd) + with setuid and authenticate the callers via PAM. + +comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, locale" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE + +config BR2_PACKAGE_SHADOW_UTMPX + bool "utmpx" + help + Enable loggin in utmpx / wtmpx. + +config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS + bool "subordinate-ids" + help + Support subordinate ids. Helpful to use container solution + like podman without root. + +config BR2_PACKAGE_SHADOW_SHA_CRYPT + bool "sha-crypt" + default y + help + Allow the SHA256 and SHA512 password encryption algorithms. + +config BR2_PACKAGE_SHADOW_BCRYPT + bool "bcrypt" + help + Allow the bcrypt password encryption algorithm. + +config BR2_PACKAGE_SHADOW_YESCRYPT + bool "yescrypt" + help + Allow the yescrypt password encryption algorithm. + +endif # BR2_PACKAGE_SHADOW + +comment "shadow needs a toolchain w/ headers >= 4.14, dynamic library" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash new file mode 100644 index 0000000000..2e5c4a8168 --- /dev/null +++ b/package/shadow/shadow.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 9afe245d79a2e7caac5f1ed62519b17416b057ec89df316df1c3935502f9dd2c shadow-4.13.tar.xz +sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk new file mode 100644 index 0000000000..d8f913a648 --- /dev/null +++ b/package/shadow/shadow.mk @@ -0,0 +1,135 @@ +################################################################################ +# +# shadow +# +################################################################################ + +SHADOW_VERSION = 4.13 +SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) +SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz +SHADOW_LICENSE = BSD-3-Clause +SHADOW_LICENSE_FILES = COPYING +SHADOW_CPE_ID_VENDOR = debian + +SHADOW_CONF_OPTS = \ + --disable-man \ + --without-btrfs \ + --without-nscd \ + --without-skey \ + --without-sssd \ + --without-su \ + --without-tcb + +ifeq ($(BR2_PACKAGE_SHADOW_SHADOWGRP),y) +SHADOW_CONF_OPTS += --enable-shadowgrp +else +SHADOW_CONF_OPTS += --disable-shadowgrp +endif + +ifeq ($(BR2_PACKAGE_SHADOW_ACCOUNT_TOOLS_SETUID),y) +SHADOW_CONF_OPTS += --enable-account-tools-setuid +define SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS + /usr/sbin/chgpasswd f 4755 0 0 - - - - - + /usr/sbin/chpasswd f 4755 0 0 - - - - - + /usr/sbin/groupadd f 4755 0 0 - - - - - + /usr/sbin/groupdel f 4755 0 0 - - - - - + /usr/sbin/groupmod f 4755 0 0 - - - - - + /usr/sbin/newusers f 4755 0 0 - - - - - + /usr/sbin/useradd f 4755 0 0 - - - - - + /usr/sbin/userdel f 4755 0 0 - - - - - + /usr/sbin/usermod f 4755 0 0 - - - - - +endef +else +SHADOW_CONF_OPTS += --disable-account-tools-setuid +endif + +ifeq ($(BR2_PACKAGE_SHADOW_UTMPX),y) +SHADOW_CONF_OPTS += --enable-utmpx +else +SHADOW_CONF_OPTS += --disable-utmpx +endif + +ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) +SHADOW_CONF_OPTS += --enable-subordinate-ids +define SHADOW_SUBORDINATE_IDS_PERMISSIONS + /usr/bin/newuidmap f 4755 0 0 - - - - - + /usr/bin/newgidmap f 4755 0 0 - - - - - +endef +else +SHADOW_CONF_OPTS += --disable-subordinate-ids +endif + +ifeq ($(BR2_PACKAGE_ACL),y) +SHADOW_CONF_OPTS += --with-acl +SHADOW_DEPENDENCIES += acl +else +SHADOW_CONF_OPTS += --without-acl +endif + +ifeq ($(BR2_PACKAGE_ATTR),y) +SHADOW_CONF_OPTS += --with-attr +SHADOW_DEPENDENCIES += attr +else +SHADOW_CONF_OPTS += --without-attr +endif + +ifeq ($(BR2_PACKAGE_AUDIT),y) +SHADOW_CONF_OPTS += --with-audit +SHADOW_DEPENDENCIES += audit +else +SHADOW_CONF_OPTS += --without-audit +endif + +ifeq ($(BR2_PACKAGE_CRACKLIB),y) +SHADOW_CONF_OPTS += --with-libcrack +SHADOW_DEPENDENCIES += cracklib +else +SHADOW_CONF_OPTS += --without-libcrack +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +SHADOW_CONF_OPTS += --with-selinux +SHADOW_DEPENDENCIES += libselinux libsemanage +else +SHADOW_CONF_OPTS += --without-selinux +endif + +# linux-pam is also used without account-tools-setuid enabled +ifeq ($(BR2_PACKAGE_LINUX_PAM),y) +SHADOW_CONF_OPTS += --with-libpam +SHADOW_DEPENDENCIES += linux-pam +else +SHADOW_CONF_OPTS += --without-libpam +endif + +ifeq ($(BR2_PACKAGE_SHADOW_SHA_CRYPT),y) +SHADOW_CONF_OPTS += --with-sha-crypt +else +SHADOW_CONF_OPTS += --without-sha-crypt +endif + +ifeq ($(BR2_PACKAGE_SHADOW_BCRYPT),y) +SHADOW_CONF_OPTS += --with-bcrypt +else +SHADOW_CONF_OPTS += --without-bcrypt +endif + +ifeq ($(BR2_PACKAGE_SHADOW_YESCRYPT),y) +SHADOW_CONF_OPTS += --with-yescrypt +else +SHADOW_CONF_OPTS += --without-yescrypt +endif + +define SHADOW_PERMISSIONS + /usr/bin/chage f 4755 0 0 - - - - - + /usr/bin/chfn f 4755 0 0 - - - - - + /usr/bin/chsh f 4755 0 0 - - - - - + /usr/bin/expiry f 4755 0 0 - - - - - + /usr/bin/gpasswd f 4755 0 0 - - - - - + /usr/bin/newgrp f 4755 0 0 - - - - - + /usr/bin/passwd f 4755 0 0 - - - - - + $(SHADOW_ACCOUNT_TOOLS_SETUID_PERMISSIONS) + $(SHADOW_SUBORDINATE_IDS_PERMISSIONS) +endef + +$(eval $(autotools-package)) diff --git a/support/testing/tests/package/test_shadow.py b/support/testing/tests/package/test_shadow.py new file mode 100644 index 0000000000..c5151b4fdb --- /dev/null +++ b/support/testing/tests/package/test_shadow.py @@ -0,0 +1,55 @@ +import os + +from infra.basetest import BRTest, BASIC_TOOLCHAIN_CONFIG + + +class TestShadow(BRTest): + username = 'user_test' + config = BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_arm=y + BR2_PACKAGE_SHADOW=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="65536" + """ + timeout = 60 + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv7", + kernel="builtin", + kernel_cmdline=["root=/dev/mmcblk0", + "rootfstype=ext4"], + options=["-drive", f"file={img},if=sd,format=raw"]) + self.emulator.login() + + def test_nologin(self): + self.login() + + self.assertRunOk("! nologin") + cmd = 'test "$(nologin)" = "This account is currently not available."' + self.assertRunOk(cmd) + + def test_useradd_del(self): + username = self.username + self.login() + + self.assertRunOk(f'userdel {username} || true') + self.assertRunOk(f'groupdel {username} || true') + self.assertRunOk(f'useradd -s /bin/sh {username}') + self.assertRunOk(f'test $(su {username} -c "whoami") = {username}') + self.assertRunOk(f'userdel {username}') + + def test_usermod(self): + username = self.username + new_home = '/tmp' + self.login() + + self.assertRunOk(f'userdel {username} || true') + self.assertRunOk(f'groupdel {username} || true') + self.assertRunOk(f'useradd -s /bin/sh {username}') + self.assertRunOk(f'usermod {username} --home {new_home}') + self.assertRunOk(f'test $(su {username} -c \'echo $HOME\') = {new_home}') + self.assertRunOk(f'userdel {username}') + From 463d0dd49454669e7d72179319aeb967686c129e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Zwing?= Date: Wed, 1 Feb 2023 20:21:57 +0100 Subject: [PATCH 29/66] package/wine: bump to version 8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Multiple library checks are obsolete, either due to removal or due to built-in solutions. License file changed due to update of copyright year. Signed-off-by: André Zwing Signed-off-by: Thomas Petazzoni --- ...a-avoid-mpg123-functions-with-suffix.patch | 21 ----------- ...d-avoid-mpg123-functions-with-suffix.patch | 21 ----------- package/wine/wine.hash | 4 +-- package/wine/wine.mk | 35 ++----------------- 4 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch delete mode 100644 package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch diff --git a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch b/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 8332db4b38..0000000000 --- a/package/wine/0001-l3codeca-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 75b70efdaa2d4baa064271098878b79f66df155f -Author: André Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - l3codeca.acm: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/75b70efdaa2d4baa064271098878b79f66df155f] -Signed-off-by: André Zwing - -diff --git a/dlls/l3codeca.acm/Makefile.in b/dlls/l3codeca.acm/Makefile.in -index 451794b2624..31765766d4e 100644 ---- a/dlls/l3codeca.acm/Makefile.in -+++ b/dlls/l3codeca.acm/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = l3codeca.acm - IMPORTS = $(MPG123_PE_LIBS) winmm user32 kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mpegl3.c diff --git a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch b/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch deleted file mode 100644 index 16f2ba2898..0000000000 --- a/package/wine/0002-mp3dmod-avoid-mpg123-functions-with-suffix.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 8d441659f7c7ae359e06a99e7abaae57792356a0 -Author: André Zwing -Date: Sat May 21 17:53:07 2022 +0200 - - mp3dmod: Avoid mpg123 functions with suffix. - -[Upstream commit: https://source.winehq.org/git/wine.git/commit/8d441659f7c7ae359e06a99e7abaae57792356a0] -Signed-off-by: André Zwing - -diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in -index dabbb1dfeae..3ba343a4d34 100644 ---- a/dlls/mp3dmod/Makefile.in -+++ b/dlls/mp3dmod/Makefile.in -@@ -1,6 +1,7 @@ - MODULE = mp3dmod.dll - IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase - EXTRAINCL = $(MPG123_PE_CFLAGS) -+EXTRADEFS = -DMPG123_NO_LARGENAME - - C_SRCS = \ - mp3dmod.c diff --git a/package/wine/wine.hash b/package/wine/wine.hash index 9a7a1c342a..b87964da12 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 5b43e27d5c085cb18f97394e46180310d5eef7c1d91c6895432a3889b2de086b wine-7.0.tar.xz +sha256 0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e wine-8.0.tar.xz # Locally calculated sha256 e237fa56668030e928551ddd60f05df5fe957f75eab874bbd017e085ed722e7c COPYING.LIB -sha256 7c360930e51d56c8fa12fe1df8ed348ac77a9ad73f9582a303919469399b3ce4 LICENSE +sha256 793d045546467c8f49e35fbd6e02859e57e78f8bb53571e8200bffd0e966dfa8 LICENSE diff --git a/package/wine/wine.mk b/package/wine/wine.mk index a1c65bef4e..a629bf0dd6 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 7.0 +WINE_VERSION = 8.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/7.0 +WINE_SITE = https://dl.winehq.org/wine/source/8.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_CPE_ID_VENDOR = winehq @@ -27,7 +27,6 @@ WINE_CONF_OPTS = \ --without-mingw \ --without-opencl \ --without-oss \ - --without-vkd3d \ --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to @@ -131,20 +130,6 @@ else WINE_CONF_OPTS += --without-v4l2 endif -ifeq ($(BR2_PACKAGE_OPENAL),y) -WINE_CONF_OPTS += --with-openal -WINE_DEPENDENCIES += openal -else -WINE_CONF_OPTS += --without-openal -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -WINE_CONF_OPTS += --with-ldap -WINE_DEPENDENCIES += openldap -else -WINE_CONF_OPTS += --without-ldap -endif - ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d @@ -266,19 +251,8 @@ endif # Wine only needs the host tools to be built, so cut-down the # build time by building just what we need. -HOST_WINE_TOOLS = \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc - define HOST_WINE_BUILD_CMDS - $(foreach t, $(HOST_WINE_TOOLS), - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/$(t) - ) + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) __tooldeps__ endef # Wine only needs its host variant to be built, not that it is @@ -304,10 +278,8 @@ HOST_WINE_CONF_OPTS += \ --without-gssapi \ --without-gstreamer \ --without-krb5 \ - --without-ldap \ --without-mingw \ --without-netapi \ - --without-openal \ --without-opencl \ --without-opengl \ --without-osmesa \ @@ -318,7 +290,6 @@ HOST_WINE_CONF_OPTS += \ --without-sdl \ --without-usb \ --without-v4l2 \ - --without-vkd3d \ --without-vulkan \ --without-x \ --without-xcomposite \ From 3254a2886a4e20111e5c87614f6f374ec626b755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 23 Feb 2023 19:08:46 +0100 Subject: [PATCH 30/66] boot/boot-wrapper-aarch64: bump version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump boot-wrapper to the latest version. Signed-off-by: Vincent Stehlé Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk index 30b352f8e7..95f7e22760 100644 --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOT_WRAPPER_AARCH64_VERSION = 8d5a765251d9113c3c0f9fa14de42a9e7486fe8a +BOOT_WRAPPER_AARCH64_VERSION = 9f26a1c1f27bd6b5b66c265114848007fc22e4aa BOOT_WRAPPER_AARCH64_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git BOOT_WRAPPER_AARCH64_SITE_METHOD = git BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause From b793f3a49e1ef8a48671ce19579586a0b018179d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Thu, 23 Feb 2023 19:08:47 +0100 Subject: [PATCH 31/66] configs/arm_foundationv8: bump to Linux 6.1.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Bump Linux kernel to v6.1.13 and increase the rootfs size accordingly. - Bump the FVP in the readme to version 11.20 build 15 and update the command line. Signed-off-by: Vincent Stehlé Cc: Masahiro Yamada Signed-off-by: Thomas Petazzoni --- board/arm/foundation-v8/readme.txt | 4 ++-- configs/arm_foundationv8_defconfig | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/board/arm/foundation-v8/readme.txt b/board/arm/foundation-v8/readme.txt index b5106f015e..cb0fe08b87 100644 --- a/board/arm/foundation-v8/readme.txt +++ b/board/arm/foundation-v8/readme.txt @@ -3,14 +3,14 @@ ARM software simulator of the AArch64 architecture. First, one has to download the AArch64 software simulator from: - https://silver.arm.com/download/download.tm?pv=4807186 + https://armkeil.blob.core.windows.net/developer/Files/downloads/ecosystem-models/Foundation_Platform_11.20_15_Linux64.tgz Then, use the arm_foundationv8_defconfig configuration to build your Buildroot system. Finally, boot your system with: - ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-6.4/Foundation_Platform \ + ${LOCATION_OF_FOUNDATIONV8_SIMULATOR}/models/Linux64_GCC-9.3/Foundation_Platform \ --image output/images/linux-system.axf \ --block-device output/images/rootfs.ext2 \ --network=nat \ diff --git a/configs/arm_foundationv8_defconfig b/configs/arm_foundationv8_defconfig index 3c63f5dc76..102fe8fd09 100644 --- a/configs/arm_foundationv8_defconfig +++ b/configs/arm_foundationv8_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y -# Linux headers same as kernel, a 5.16 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.20" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.13" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/foundation-v8-gicv3-psci" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_BOOT_WRAPPER_AARCH64=y BR2_TARGET_BOOT_WRAPPER_AARCH64_DTS="arm/foundation-v8-gicv3-psci" From c95eca4e2cc86be99b8955502b82ba84da7bb775 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 Mar 2023 09:50:47 +0100 Subject: [PATCH 32/66] package/htop: bump to version 3.2.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/htop/htop.hash | 4 ++-- package/htop/htop.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/htop/htop.hash b/package/htop/htop.hash index d43da13441..12dc864de1 100644 --- a/package/htop/htop.hash +++ b/package/htop/htop.hash @@ -1,5 +1,5 @@ -# From https://github.com/htop-dev/htop/releases/download/3.2.1/htop-3.2.1.tar.xz.sha256 -sha256 5a17121cf1c69d2f2e557c0b29d45a2c353ab983f644742e1c2e4ece15aa6cbb htop-3.2.1.tar.xz +# From https://github.com/htop-dev/htop/releases/download/3.2.2/htop-3.2.2.tar.xz.sha256 +sha256 bac9e9ab7198256b8802d2e3b327a54804dc2a19b77a5f103645b11c12473dc8 htop-3.2.2.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/htop/htop.mk b/package/htop/htop.mk index df2ec25908..aafda5d48f 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTOP_VERSION = 3.2.1 +HTOP_VERSION = 3.2.2 HTOP_SOURCE = htop-$(HTOP_VERSION).tar.xz HTOP_SITE = https://github.com/htop-dev/htop/releases/download/$(HTOP_VERSION) HTOP_DEPENDENCIES = ncurses From c4a2c66f6c9b479cedfde8774ac0ac386345334d Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 Mar 2023 09:50:55 +0100 Subject: [PATCH 33/66] package/libgtk3: bump to version 3.24.37 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 9fed2c9df2..22c37bf605 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.36.sha256sum -sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.37.sha256sum +sha256 6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57 gtk+-3.24.37.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef..18a8a9fa42 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).36 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).37 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From f969665d8f66864a760693b42b395a93cb4020a1 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 Mar 2023 09:51:03 +0100 Subject: [PATCH 34/66] package/pango: bump to version 1.50.14 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/pango/pango.hash | 4 ++-- package/pango/pango.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pango/pango.hash b/package/pango/pango.hash index 1dbc5c9197..3e609e6e04 100644 --- a/package/pango/pango.hash +++ b/package/pango/pango.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/pango/1.50/pango-1.50.12.sha256sum -sha256 caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3 pango-1.50.12.tar.xz +# From https://download.gnome.org/sources/pango/1.50/pango-1.50.14.sha256sum +sha256 1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8 pango-1.50.14.tar.xz # Locally computed sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING diff --git a/package/pango/pango.mk b/package/pango/pango.mk index f19faf0502..723e6d2288 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -5,7 +5,7 @@ ################################################################################ PANGO_VERSION_MAJOR = 1.50 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).12 +PANGO_VERSION = $(PANGO_VERSION_MAJOR).14 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz PANGO_SITE = https://download.gnome.org/sources/pango/$(PANGO_VERSION_MAJOR) PANGO_INSTALL_STAGING = YES From 5bfc02c0ad879f3e692cbe0330317e6a35507651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Mon, 6 Mar 2023 22:16:46 +0100 Subject: [PATCH 35/66] package/openfpgaloader: fix typos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix a typo in the name of two configuration options. This repairs the selection of libgpiod support. Signed-off-by: Vincent Stehlé Cc: Jean Burgat Acked-by: Gwenhael Goavec-merou Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 9 +++++++++ package/openfpgaloader/Config.in | 2 +- package/openfpgaloader/openfpgaloader.mk | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 7f69462f2e..1d247fe1a0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,15 @@ endif ############################################################################### +comment "Legacy options removed in 2023.05" + +config BR2_PACAKGE_OPENFPGALOADER_CMSIS + bool "openfpgaloader cmsis option name fixed" + select BR2_LEGACY + help + A typo on BR2_PACAKGE_OPENFPGALOADER_CMSIS was fixed by + renaming the option to BR2_PACKAGE_OPENFPGALOADER_CMSIS. + comment "Legacy options removed in 2023.02" config BR2_KERNEL_HEADERS_6_0 diff --git a/package/openfpgaloader/Config.in b/package/openfpgaloader/Config.in index 4ba01d12d3..bd83ad415b 100644 --- a/package/openfpgaloader/Config.in +++ b/package/openfpgaloader/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_OPENFPGALOADER if BR2_PACKAGE_OPENFPGALOADER -config BR2_PACAKGE_OPENFPGALOADER_CMSIS +config BR2_PACKAGE_OPENFPGALOADER_CMSIS bool "CMSIS-DAP support" depends on BR2_PACKAGE_HAS_UDEV # hidapi depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # hidapi diff --git a/package/openfpgaloader/openfpgaloader.mk b/package/openfpgaloader/openfpgaloader.mk index 042b16612e..6d7fbd9850 100644 --- a/package/openfpgaloader/openfpgaloader.mk +++ b/package/openfpgaloader/openfpgaloader.mk @@ -17,14 +17,14 @@ else OPENFPGALOADER_CONF_OPTS += -DENABLE_UDEV=OFF endif -ifeq ($(BR2_PACAKGE_OPENFPGALOADER_CMSIS),y) +ifeq ($(BR2_PACKAGE_OPENFPGALOADER_CMSIS),y) OPENFPGALOADER_DEPENDENCIES += hidapi OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=ON else OPENFPGALOADER_CONF_OPTS += -DENABLE_CMSISDAP=OFF endif -ifeq ($(BR2_PACAKGE_OPENFPGALOADER_LIBGPIOD),y) +ifeq ($(BR2_PACKAGE_OPENFPGALOADER_LIBGPIOD),y) OPENFPGALOADER_DEPENDENCIES += libgpiod OPENFPGALOADER_CONF_OPTS += -DENABLE_LIBGPIOD=ON else From b07c7eb6f48004753e0959b304f8489132ff7b39 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 7 Mar 2023 11:05:25 +0200 Subject: [PATCH 36/66] package/strace: bump to version 6.2 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index 9478fbd459..d49abf1f16 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.1/strace-6.1.tar.xz.asc -sha256 2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd strace-6.1.tar.xz +# https://strace.io/files/6.2/strace-6.2.tar.xz.asc +sha256 0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8 strace-6.2.tar.xz sha256 d92f973d08c8466993efff1e500453add0c038c20b4d2cbce3297938a296aea9 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index cbb574559e..730a91d277 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.1 +STRACE_VERSION = 6.2 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From d1b87a346a0c0b775ee44ec7090bee03ba8be7ba Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 7 Mar 2023 10:35:02 +0100 Subject: [PATCH 37/66] board/qemu/aarch64-sbsa: use PARTLABEL to specify root Specifying /dev/sda2 is ambigious, and when booting my arm64 machine this tries to mount the second partition of my ATA drive, instead of the second partition of the USB-stick, simply because the ATA driver is probed earlier than the USB controller driver. To solve this problem, use PARTLABEL=root to specify the root filesystem. This is similar to how it is currently done for board/aarch64-efi/grub.cfg and board/qemu/aarch64-ebbr/grub.cfg. Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-sbsa/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg index cd486caf4c..39b7842f8f 100644 --- a/board/qemu/aarch64-sbsa/grub.cfg +++ b/board/qemu/aarch64-sbsa/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /Image root=/dev/sda2 rootwait console=ttyAMA0 + linux /Image root=PARTLABEL=root rootwait console=ttyAMA0 } From 92f6a843b81479a9c8f8769d9e728767646b9901 Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 7 Mar 2023 10:35:03 +0100 Subject: [PATCH 38/66] board/qemu/aarch64-sbsa: use the default console specified by ACPI ARM SBBR (Server Base Boot Requirements) defines SPCR (Serial Port Console Redirection Table) as a mandatory ACPI table that specifies the configuration of a serial console. In the linux kernel, ARM developers have decided that consoles defined by SPCR are always enabled when existing, see e.g.: https://lore.kernel.org/linux-serial/20200430161438.17640-1-alpernebiyasak@gmail.com/T/ Specifying console=ttyAMA0 (which is a serial console) is thus redundant for an ARM SBSA board. (It also blindly assumes that the serial console is on ttyAMA0, which might not be true.) Drop the explicit console=ttyAMA0 on the kernel command line, such that the kernel can pick up the default console defined by SPCR. This is similar to how it is currently done for board/aarch64-efi/grub.cfg. Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- board/qemu/aarch64-sbsa/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/qemu/aarch64-sbsa/grub.cfg b/board/qemu/aarch64-sbsa/grub.cfg index 39b7842f8f..d99e19c4cd 100644 --- a/board/qemu/aarch64-sbsa/grub.cfg +++ b/board/qemu/aarch64-sbsa/grub.cfg @@ -2,5 +2,5 @@ set default="0" set timeout="5" menuentry "Buildroot" { - linux /Image root=PARTLABEL=root rootwait console=ttyAMA0 + linux /Image root=PARTLABEL=root rootwait } From 3ecff27df15c2c22f7b9d8f7554119bc0346ff5b Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Tue, 7 Mar 2023 10:35:04 +0100 Subject: [PATCH 39/66] support/testing: move the kernel config only used by test_edk2.py The kernel config board/qemu/aarch64-sbsa/linux.config has never been in use by qemu_aarch64_sbsa_defconfig, neither via BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE, nor via BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES. test_edk2.py is using the kernel config board/qemu/aarch64-sbsa/linux.config. However, storing a kernel config that is not used by qemu_aarch64_sbsa_defconfig, in a directory that is "owned" by qemu_aarch64_sbsa_defconfig, is bound to cause confusion. Therefore, move the config file to a new subdirectory: support/testing/tests/boot/test_edk2/ This is similar to how e.g. test_grub.py has a subdirectory: support/testing/tests/boot/test_grub/ where it keeps the kernel config that is only used by test_grub.py. Signed-off-by: Niklas Cassel Signed-off-by: Thomas Petazzoni --- support/testing/tests/boot/test_edk2.py | 2 +- .../testing/tests/boot/test_edk2}/linux.config | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {board/qemu/aarch64-sbsa => support/testing/tests/boot/test_edk2}/linux.config (100%) diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index c1be8fad95..623e77e992 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -18,7 +18,7 @@ class TestEdk2(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.34" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y - BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-sbsa/linux.config" + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="support/testing/tests/boot/test_edk2/linux.config" BR2_TARGET_EDK2=y BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA=y BR2_TARGET_GRUB2=y diff --git a/board/qemu/aarch64-sbsa/linux.config b/support/testing/tests/boot/test_edk2/linux.config similarity index 100% rename from board/qemu/aarch64-sbsa/linux.config rename to support/testing/tests/boot/test_edk2/linux.config From da3ef3e8b828cc99f49c95ad6bef39c55f87e512 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 11 Mar 2023 13:46:06 +0100 Subject: [PATCH 40/66] package/lsof: bump to version 4.98.0 For change log since 4.96.5, see: - https://github.com/lsof-org/lsof/releases/tag/4.97.0 - https://github.com/lsof-org/lsof/releases/tag/4.98.0 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/lsof/lsof.hash | 2 +- package/lsof/lsof.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lsof/lsof.hash b/package/lsof/lsof.hash index 29cf443a24..b6a29b3cea 100644 --- a/package/lsof/lsof.hash +++ b/package/lsof/lsof.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e9030af1123ff052ab69e12ef55b8a17dc47ac4bccfba85ee1ca1f31acf29607 lsof-4.96.5.tar.gz +sha256 80308a614508814ac70eb2ae1ed2c4344dcf6076fa60afc7734d6b1a79e62b16 lsof-4.98.0.tar.gz sha256 32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1 dialects/linux/dproto.h diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index fd5887141b..66911dddb9 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -4,7 +4,7 @@ # ################################################################################ -LSOF_VERSION = 4.96.5 +LSOF_VERSION = 4.98.0 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. From 773535fbac1acd9bc08cde5b44db0d4c1e19de31 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 11 Mar 2023 13:46:07 +0100 Subject: [PATCH 41/66] support/testing/tests/package/test_lsof.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_lsof.py | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 support/testing/tests/package/test_lsof.py diff --git a/DEVELOPERS b/DEVELOPERS index d052e59122..7733d5a04e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1719,6 +1719,7 @@ F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_libjxl.py +F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_ncdu.py F: support/testing/tests/package/test_octave.py F: support/testing/tests/package/test_ola.py diff --git a/support/testing/tests/package/test_lsof.py b/support/testing/tests/package/test_lsof.py new file mode 100644 index 0000000000..b0478dfbb7 --- /dev/null +++ b/support/testing/tests/package/test_lsof.py @@ -0,0 +1,41 @@ +import os + +import infra.basetest + + +class TestLsof(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_LSOF=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() + + test_file = "/tmp/this-is-a-test-file" + + # Check the program can execute + self.assertRunOk("lsof -v") + + # Check a normal program invocation + self.assertRunOk("lsof") + + # Check lsof fails if requested file is not opened + _, exit_code = self.emulator.run("lsof {}".format(test_file)) + self.assertNotEqual(exit_code, 0) + + # Open the test file from the shell on descriptor 10 + self.assertRunOk("exec 10> {}".format(test_file)) + + # Check that lsof now show the file + output, exit_code = self.emulator.run("lsof {}".format(test_file)) + self.assertEqual(exit_code, 0) + # output[0] is the lsof header line + self.assertIn(test_file, output[1]) From f32176a7671d8842b175077a92e268226fcec78f Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Fri, 10 Mar 2023 10:01:53 +0100 Subject: [PATCH 42/66] package/libgit2: bump to version 1.6.2 * Fix the license because libgit2 has been using some android code without attribution. This explains the change of the hash in the license file, which now includes the text of the BSD-2-Clause license. * Building in-source is accidentely broken in this release and upstream recommends a separate build directory anyway, so use a separate build directory. * Some win32-specific declarations use wchar_t, add an upstreamed patch to avoid a dependency to wchar_t elsewhere. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- ...clare-win32-functions-on-non-win32-p.patch | 35 +++++++++++++++++++ package/libgit2/libgit2.hash | 4 +-- package/libgit2/libgit2.mk | 7 ++-- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch diff --git a/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch b/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch new file mode 100644 index 0000000000..6be66ffee3 --- /dev/null +++ b/package/libgit2/0001-sysdir-Do-not-declare-win32-functions-on-non-win32-p.patch @@ -0,0 +1,35 @@ +From 20811c5aa9c528405eaa3f88ff22a9adebafa9e6 Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Wed, 8 Mar 2023 14:00:52 +0100 +Subject: [PATCH] sysdir: Do not declare win32 functions on non-win32 platforms + +These declaration poses problems on some embedded or retro Linux systems +that deliberately disable support for wchar_t from their libc. + +Signed-off-by: Nicolas Cavallari +[Retrieved from: +https://github.com/libgit2/libgit2/commit/20811c5aa9c528405eaa3f88ff22a9adebafa9e6] +--- + src/libgit2/sysdir.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libgit2/sysdir.h b/src/libgit2/sysdir.h +index 1d15bbf43..03f59e1de 100644 +--- a/src/libgit2/sysdir.h ++++ b/src/libgit2/sysdir.h +@@ -134,10 +134,12 @@ extern int git_sysdir_set(git_sysdir_t which, const char *paths); + */ + extern int git_sysdir_reset(void); + ++#ifdef GIT_WIN32 + /** Sets the registry system dir to a mock; for testing. */ + extern int git_win32__set_registry_system_dir(const wchar_t *mock_sysdir); + + /** Find the given system dir; for testing. */ + extern int git_win32__find_system_dirs(git_str *out, const char *subdir); ++#endif + + #endif +-- +2.39.2 + diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index e834525df5..baf43c66f7 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7074f1e2697992b82402501182db254fe62d64877b12f6e4c64656516f4cde88 libgit2-1.5.1.tar.gz -sha256 0fc09da43d666b5b0cf5695defc3100d5cf387936b260ebab37e396d7e0dbc83 COPYING +sha256 d557fbf35557bb5df53cbf38ae0081edb4a36494ec0d19741fa673e509245f8f libgit2-1.6.2.tar.gz +sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index c962c8030f..b31f5199e1 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,14 +4,15 @@ # ################################################################################ -LIBGIT2_VERSION = 1.5.1 +LIBGIT2_VERSION = 1.6.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ MIT (sha1), \ BSD-3-Clause (sha256), \ wildmatch license (wildmatch), \ - CC0-1.0 (xoroshiro256) + CC0-1.0 (xoroshiro256), \ + BSD-2-Clause (basename_r) LIBGIT2_LICENSE_FILES = COPYING LIBGIT2_CPE_ID_VENDOR = libgit2_project LIBGIT2_INSTALL_STAGING = YES @@ -24,6 +25,8 @@ LIBGIT2_CONF_OPTS = \ -DUSE_NTLMCLIENT=OFF \ -DUSE_THREADS=$(if $(BR2_TOOLCHAIN_HAS_THREADS),ON,OFF) +LIBGIT2_SUPPORTS_IN_SOURCE_BUILD = NO + LIBGIT2_DEPENDENCIES = zlib libhttpparser # If libiconv is available (for !locale toolchains), then we can use From 6a8e1e220fb283d57f07d68e96312a5215afd517 Mon Sep 17 00:00:00 2001 From: Luca Pesce Date: Fri, 10 Mar 2023 14:48:31 +0100 Subject: [PATCH 43/66] package/libwebsockets: enable libev and libevent support indipendently libev and libevent can be enabled at the same time since version 4.1.0, thanks to the event lib support refactoring into plugins, which is enabled by default for unix platform builds (LWS_WITH_EVLIB_PLUGINS=ON): https://github.com/warmcat/libwebsockets/commit/c6c7ab2b4498c62bf9461b36395d8466e023575d In this way, libwebsockets can be compiled with both libev and libevent support, which is then user-selectable at runtime. This basically restores the behavior changed by previous commit 27f257e. Signed-off-by: Luca Pesce Signed-off-by: Thomas Petazzoni --- package/libwebsockets/libwebsockets.mk | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk index 79624948a5..fb0ee66883 100644 --- a/package/libwebsockets/libwebsockets.mk +++ b/package/libwebsockets/libwebsockets.mk @@ -57,18 +57,16 @@ endif ifeq ($(BR2_PACKAGE_LIBEV),y) LIBWEBSOCKETS_DEPENDENCIES += libev -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_LIBEV=OFF \ - -DLWS_WITH_LIBEVENT=ON +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=ON else -LIBWEBSOCKETS_CONF_OPTS += \ - -DLWS_WITH_LIBEV=OFF \ - -DLWS_WITH_LIBEVENT=OFF +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBEVENT),y) +LIBWEBSOCKETS_DEPENDENCIES += libevent +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=ON +else +LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEVENT=OFF endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) From 9ce280ba180f8668bfcd92175842a3c2d9567223 Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Thu, 9 Mar 2023 23:04:14 +0100 Subject: [PATCH 44/66] package/libcamera-apps: bump to version 1.1.2 Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- ...ass-VIDIOC_QUERYCAP-as-unsigned-long.patch | 35 ------------------- package/libcamera-apps/libcamera-apps.hash | 2 +- package/libcamera-apps/libcamera-apps.mk | 2 +- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch diff --git a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch b/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch deleted file mode 100644 index fbd1d2d4ba..0000000000 --- a/package/libcamera-apps/0001-core-pass-VIDIOC_QUERYCAP-as-unsigned-long.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a65682a97e19f96b86aeceb3ca3befb1687e3861 Mon Sep 17 00:00:00 2001 -From: Marcus Folkesson -Date: Tue, 31 Jan 2023 09:14:15 +0100 -Subject: [PATCH] core: pass VIDIOC_QUERYCAP as unsigned long - -VIDIOC_QUARYCAP is an unsigned long and should be passed as one. - -Get rid of the following error: -core/libcamera_app.cpp:33:22: error: overflow in conversion from 'long unsigned int' to 'int' changes value from '2154321408' to '-2140645888' [-Werror=overflow] - 33 | int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); - -Upstream: https://github.com/raspberrypi/libcamera-apps/commit/a65682a97e19f96b86aeceb3ca3befb1687e3861 -Signed-off-by: Marcus Folkesson ---- - core/libcamera_app.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp -index 04696fb..8cb6563 100644 ---- a/core/libcamera_app.cpp -+++ b/core/libcamera_app.cpp -@@ -30,7 +30,9 @@ static void check_camera_stack() - return; - - v4l2_capability caps; -- int ret = ioctl(fd, VIDIOC_QUERYCAP, &caps); -+ unsigned long request = VIDIOC_QUERYCAP; -+ -+ int ret = ioctl(fd, request, &caps); - close(fd); - - if (ret < 0 || strcmp((char *)caps.driver, "bm2835 mmal")) --- -2.38.1 - diff --git a/package/libcamera-apps/libcamera-apps.hash b/package/libcamera-apps/libcamera-apps.hash index fbb3150cb5..20a06aa8fe 100644 --- a/package/libcamera-apps/libcamera-apps.hash +++ b/package/libcamera-apps/libcamera-apps.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c05e29e02da05fa92739941295d96dcb93324805f7b348ad182e7e29e7e0c520 libcamera-apps-1.1.1.tar.gz +sha256 a19f3960b97ec1c0d42df8af972868ff0d4c48be6096e7ac02dbaaa4c7c75636 libcamera-apps-1.1.2.tar.gz sha256 36dfed86bdef661a0a14ec1a1cc84c771d5a06b6f9b92e9ebb610ba711bd528a license.txt diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..ba45ab21ca 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAMERA_APPS_VERSION = 1.1.1 +LIBCAMERA_APPS_VERSION = 1.1.2 LIBCAMERA_APPS_SITE = $(call github,raspberrypi,libcamera-apps,v$(LIBCAMERA_APPS_VERSION)) LIBCAMERA_APPS_LICENSE = BSD-2-Clause LIBCAMERA_APPS_LICENSE_FILES = license.txt From b83550bd0c2bbfc894d1c82ec0ea330c8283deee Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Wed, 8 Mar 2023 18:25:33 +0100 Subject: [PATCH 45/66] package/janus-gateway: bump to version 1.1.2 Remove patch applied upstream. Signed-off-by: Nicolas Cavallari Signed-off-by: Thomas Petazzoni --- ...se-parentheses-to-ensure-compilation.patch | 27 ------------------- package/janus-gateway/janus-gateway.hash | 2 +- package/janus-gateway/janus-gateway.mk | 2 +- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch diff --git a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch deleted file mode 100644 index f91c13d1f6..0000000000 --- a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 51431c36cd5f2997c0f7723909195b9883ae0486 Mon Sep 17 00:00:00 2001 -From: Benson Muite -Date: Wed, 4 Jan 2023 13:33:36 +0300 -Subject: [PATCH] Use parentheses to ensure compilation (#3138) - -Compiler fails with latest Curl release. Use parenthesis to ensure compiler evaluates expression correctly. - -[Retrieved from: -https://github.com/meetecho/janus-gateway/commit/51431c36cd5f2997c0f7723909195b9883ae0486] -Signed-off-by: Fabrice Fontaine ---- - src/turnrest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/turnrest.c b/src/turnrest.c -index b8560d22f2..42e6114de8 100644 ---- a/src/turnrest.c -+++ b/src/turnrest.c -@@ -165,7 +165,7 @@ janus_turnrest_response *janus_turnrest_request(const char *user) { - JANUS_LOG(LOG_VERB, "Sending request: %s\n", request_uri); - janus_mutex_unlock(&api_mutex); - curl_easy_setopt(curl, CURLOPT_URL, request_uri); -- curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1); -+ curl_easy_setopt(curl, (api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST), 1); - if(!api_http_get) { - /* FIXME Some servers don't like a POST with no data */ - curl_easy_setopt(curl, CURLOPT_POSTFIELDS, query_string); diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index 7a87ae737a..a147a8afff 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 bb83c19d6137e39833e8eb2b1deeecb33b5d19d4f503d51703bdcc478c447940 janus-gateway-1.1.1.tar.gz +sha256 f721d62a22b38ba3a341a5502f06b8b3a5a4f7bd0e9cc6c53de257fe99695e17 janus-gateway-1.1.2.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index dd898563e5..786bc211d4 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 1.1.1 +JANUS_GATEWAY_VERSION = 1.1.2 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 From 7cc92e463771f5542d796a73ff7aadce8cf09b0f Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Mon, 6 Mar 2023 07:45:28 -0600 Subject: [PATCH 46/66] package/ethtool: bump to version 6.2 Drop our patches as they are included in the new version. Signed-off-by: Vincent Fazio Reviewed-by: Florian Fainelli Signed-off-by: Thomas Petazzoni --- package/ethtool/0001-uapi-Bring-in-if.h.patch | 483 ------------------ ...2-marvell.c-Fix-build-with-musl-libc.patch | 71 --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 4 files changed, 2 insertions(+), 556 deletions(-) delete mode 100644 package/ethtool/0001-uapi-Bring-in-if.h.patch delete mode 100644 package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch diff --git a/package/ethtool/0001-uapi-Bring-in-if.h.patch b/package/ethtool/0001-uapi-Bring-in-if.h.patch deleted file mode 100644 index faf264f61f..0000000000 --- a/package/ethtool/0001-uapi-Bring-in-if.h.patch +++ /dev/null @@ -1,483 +0,0 @@ -From fd02caa75918401f2cb75af1f2a181c1959e070d Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Sat, 14 Jan 2023 08:34:09 -0800 -Subject: [PATCH] uapi: Bring in if.h - -Bring in if.h from commit eec517cdb481 ("net: Add IF_OPER_TESTING") as -well as uapi/linux/hdlc/ioctl.h. Ensure that we define all of the -necessary guards to provide updated definitions of ifmap, ifreq and -IFNAMSIZ. This resolves build issues with kernel headers < 4.11 which -lacked 2618be7dccf8739b89e1906b64bd8d551af351e6 ("uapi: fix linux/if.h -userspace compilation errors"). - -Fixes: 1fa60003a8b8 ("misc: header includes cleanup") -Reported-by: Markus Mayer -Signed-off-by: Florian Fainelli -Message-Id: <20230114163411.3290201-2-f.fainelli@gmail.com> - -[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-2-f.fainelli@gmail.com/] -[vfazio@gmail.com: fix whitespace issues] -Signed-off-by: Vincent Fazio ---- - Makefile.am | 6 +- - internal.h | 7 +- - uapi/linux/hdlc/ioctl.h | 94 +++++++++++++ - uapi/linux/if.h | 296 ++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 397 insertions(+), 6 deletions(-) - create mode 100644 uapi/linux/hdlc/ioctl.h - create mode 100644 uapi/linux/if.h - -diff --git a/Makefile.am b/Makefile.am -index 663f40a..691a20e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,8 @@ EXTRA_DIST = LICENSE ethtool.8 ethtool.spec.in aclocal.m4 ChangeLog autogen.sh - - sbin_PROGRAMS = ethtool - ethtool_SOURCES = ethtool.c uapi/linux/ethtool.h internal.h \ -- uapi/linux/net_tstamp.h rxclass.c common.c common.h \ -+ uapi/linux/net_tstamp.h uapi/linux/if.h uapi/linux/hdlc/ioctl.h \ -+ rxclass.c common.c common.h \ - json_writer.c json_writer.h json_print.c json_print.h \ - list.h - if ETHTOOL_ENABLE_PRETTY_DUMP -@@ -43,7 +44,8 @@ ethtool_SOURCES += \ - netlink/desc-rtnl.c netlink/cable_test.c netlink/tunnels.c \ - uapi/linux/ethtool_netlink.h \ - uapi/linux/netlink.h uapi/linux/genetlink.h \ -- uapi/linux/rtnetlink.h uapi/linux/if_link.h -+ uapi/linux/rtnetlink.h uapi/linux/if_link.h \ -+ uapi/linux/if.h uapi/linux/hdlc/ioctl.h - AM_CPPFLAGS += @MNL_CFLAGS@ - LDADD += @MNL_LIBS@ - endif -diff --git a/internal.h b/internal.h -index b80f77a..3923719 100644 ---- a/internal.h -+++ b/internal.h -@@ -21,6 +21,9 @@ - #include - #include - #include -+#define __UAPI_DEF_IF_IFNAMSIZ 1 -+#define __UAPI_DEF_IF_IFMAP 1 -+#define __UAPI_DEF_IF_IFREQ 1 - #include - - #include "json_writer.h" -@@ -52,10 +55,6 @@ typedef int32_t s32; - #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) - #endif - --#ifndef ALTIFNAMSIZ --#define ALTIFNAMSIZ 128 --#endif -- - #include - #include - -diff --git a/uapi/linux/hdlc/ioctl.h b/uapi/linux/hdlc/ioctl.h -new file mode 100644 -index 0000000..b06341a ---- /dev/null -+++ b/uapi/linux/hdlc/ioctl.h -@@ -0,0 +1,94 @@ -+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -+#ifndef __HDLC_IOCTL_H__ -+#define __HDLC_IOCTL_H__ -+ -+ -+#define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */ -+ -+#define CLOCK_DEFAULT 0 /* Default setting */ -+#define CLOCK_EXT 1 /* External TX and RX clock - DTE */ -+#define CLOCK_INT 2 /* Internal TX and RX clock - DCE */ -+#define CLOCK_TXINT 3 /* Internal TX and external RX clock */ -+#define CLOCK_TXFROMRX 4 /* TX clock derived from external RX clock */ -+ -+ -+#define ENCODING_DEFAULT 0 /* Default setting */ -+#define ENCODING_NRZ 1 -+#define ENCODING_NRZI 2 -+#define ENCODING_FM_MARK 3 -+#define ENCODING_FM_SPACE 4 -+#define ENCODING_MANCHESTER 5 -+ -+ -+#define PARITY_DEFAULT 0 /* Default setting */ -+#define PARITY_NONE 1 /* No parity */ -+#define PARITY_CRC16_PR0 2 /* CRC16, initial value 0x0000 */ -+#define PARITY_CRC16_PR1 3 /* CRC16, initial value 0xFFFF */ -+#define PARITY_CRC16_PR0_CCITT 4 /* CRC16, initial 0x0000, ITU-T version */ -+#define PARITY_CRC16_PR1_CCITT 5 /* CRC16, initial 0xFFFF, ITU-T version */ -+#define PARITY_CRC32_PR0_CCITT 6 /* CRC32, initial value 0x00000000 */ -+#define PARITY_CRC32_PR1_CCITT 7 /* CRC32, initial value 0xFFFFFFFF */ -+ -+#define LMI_DEFAULT 0 /* Default setting */ -+#define LMI_NONE 1 /* No LMI, all PVCs are static */ -+#define LMI_ANSI 2 /* ANSI Annex D */ -+#define LMI_CCITT 3 /* ITU-T Annex A */ -+#define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */ -+ -+#ifndef __ASSEMBLY__ -+ -+typedef struct { -+ unsigned int clock_rate; /* bits per second */ -+ unsigned int clock_type; /* internal, external, TX-internal etc. */ -+ unsigned short loopback; -+} sync_serial_settings; /* V.35, V.24, X.21 */ -+ -+typedef struct { -+ unsigned int clock_rate; /* bits per second */ -+ unsigned int clock_type; /* internal, external, TX-internal etc. */ -+ unsigned short loopback; -+ unsigned int slot_map; -+} te1_settings; /* T1, E1 */ -+ -+typedef struct { -+ unsigned short encoding; -+ unsigned short parity; -+} raw_hdlc_proto; -+ -+typedef struct { -+ unsigned int t391; -+ unsigned int t392; -+ unsigned int n391; -+ unsigned int n392; -+ unsigned int n393; -+ unsigned short lmi; -+ unsigned short dce; /* 1 for DCE (network side) operation */ -+} fr_proto; -+ -+typedef struct { -+ unsigned int dlci; -+} fr_proto_pvc; /* for creating/deleting FR PVCs */ -+ -+typedef struct { -+ unsigned int dlci; -+ char master[IFNAMSIZ]; /* Name of master FRAD device */ -+}fr_proto_pvc_info; /* for returning PVC information only */ -+ -+typedef struct { -+ unsigned int interval; -+ unsigned int timeout; -+} cisco_proto; -+ -+typedef struct { -+ unsigned short dce; /* 1 for DCE (network side) operation */ -+ unsigned int modulo; /* modulo (8 = basic / 128 = extended) */ -+ unsigned int window; /* frame window size */ -+ unsigned int t1; /* timeout t1 */ -+ unsigned int t2; /* timeout t2 */ -+ unsigned int n2; /* frame retry counter */ -+} x25_hdlc_proto; -+ -+/* PPP doesn't need any info now - supply length = 0 to ioctl */ -+ -+#endif /* __ASSEMBLY__ */ -+#endif /* __HDLC_IOCTL_H__ */ -diff --git a/uapi/linux/if.h b/uapi/linux/if.h -new file mode 100644 -index 0000000..75ee7f4 ---- /dev/null -+++ b/uapi/linux/if.h -@@ -0,0 +1,296 @@ -+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ -+/* -+ * INET An implementation of the TCP/IP protocol suite for the LINUX -+ * operating system. INET is implemented using the BSD Socket -+ * interface as the means of communication with the user level. -+ * -+ * Global definitions for the INET interface module. -+ * -+ * Version: @(#)if.h 1.0.2 04/18/93 -+ * -+ * Authors: Original taken from Berkeley UNIX 4.3, (c) UCB 1982-1988 -+ * Ross Biro -+ * Fred N. van Kempen, -+ * -+ * 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 _LINUX_IF_H -+#define _LINUX_IF_H -+ -+#include /* for compatibility with glibc */ -+#include /* for "__kernel_caddr_t" et al */ -+#include /* for "struct sockaddr" et al */ -+ /* for "__user" et al */ -+ -+#include /* for struct sockaddr. */ -+ -+#if __UAPI_DEF_IF_IFNAMSIZ -+#define IFNAMSIZ 16 -+#endif /* __UAPI_DEF_IF_IFNAMSIZ */ -+#define IFALIASZ 256 -+#define ALTIFNAMSIZ 128 -+#include -+ -+/* For glibc compatibility. An empty enum does not compile. */ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \ -+ __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 -+/** -+ * enum net_device_flags - &struct net_device flags -+ * -+ * These are the &struct net_device flags, they can be set by drivers, the -+ * kernel and some can be triggered by userspace. Userspace can query and -+ * set these flags using userspace utilities but there is also a sysfs -+ * entry available for all dev flags which can be queried and set. These flags -+ * are shared for all types of net_devices. The sysfs entries are available -+ * via /sys/class/net//flags. Flags which can be toggled through sysfs -+ * are annotated below, note that only a few flags can be toggled and some -+ * other flags are always preserved from the original net_device flags -+ * even if you try to set them via sysfs. Flags which are always preserved -+ * are kept under the flag grouping @IFF_VOLATILE. Flags which are __volatile__ -+ * are annotated below as such. -+ * -+ * You should have a pretty good reason to be extending these flags. -+ * -+ * @IFF_UP: interface is up. Can be toggled through sysfs. -+ * @IFF_BROADCAST: broadcast address valid. Volatile. -+ * @IFF_DEBUG: turn on debugging. Can be toggled through sysfs. -+ * @IFF_LOOPBACK: is a loopback net. Volatile. -+ * @IFF_POINTOPOINT: interface is has p-p link. Volatile. -+ * @IFF_NOTRAILERS: avoid use of trailers. Can be toggled through sysfs. -+ * Volatile. -+ * @IFF_RUNNING: interface RFC2863 OPER_UP. Volatile. -+ * @IFF_NOARP: no ARP protocol. Can be toggled through sysfs. Volatile. -+ * @IFF_PROMISC: receive all packets. Can be toggled through sysfs. -+ * @IFF_ALLMULTI: receive all multicast packets. Can be toggled through -+ * sysfs. -+ * @IFF_MASTER: master of a load balancer. Volatile. -+ * @IFF_SLAVE: slave of a load balancer. Volatile. -+ * @IFF_MULTICAST: Supports multicast. Can be toggled through sysfs. -+ * @IFF_PORTSEL: can set media type. Can be toggled through sysfs. -+ * @IFF_AUTOMEDIA: auto media select active. Can be toggled through sysfs. -+ * @IFF_DYNAMIC: dialup device with changing addresses. Can be toggled -+ * through sysfs. -+ * @IFF_LOWER_UP: driver signals L1 up. Volatile. -+ * @IFF_DORMANT: driver signals dormant. Volatile. -+ * @IFF_ECHO: echo sent packets. Volatile. -+ */ -+enum net_device_flags { -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS -+ IFF_UP = 1<<0, /* sysfs */ -+ IFF_BROADCAST = 1<<1, /* __volatile__ */ -+ IFF_DEBUG = 1<<2, /* sysfs */ -+ IFF_LOOPBACK = 1<<3, /* __volatile__ */ -+ IFF_POINTOPOINT = 1<<4, /* __volatile__ */ -+ IFF_NOTRAILERS = 1<<5, /* sysfs */ -+ IFF_RUNNING = 1<<6, /* __volatile__ */ -+ IFF_NOARP = 1<<7, /* sysfs */ -+ IFF_PROMISC = 1<<8, /* sysfs */ -+ IFF_ALLMULTI = 1<<9, /* sysfs */ -+ IFF_MASTER = 1<<10, /* __volatile__ */ -+ IFF_SLAVE = 1<<11, /* __volatile__ */ -+ IFF_MULTICAST = 1<<12, /* sysfs */ -+ IFF_PORTSEL = 1<<13, /* sysfs */ -+ IFF_AUTOMEDIA = 1<<14, /* sysfs */ -+ IFF_DYNAMIC = 1<<15, /* sysfs */ -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO -+ IFF_LOWER_UP = 1<<16, /* __volatile__ */ -+ IFF_DORMANT = 1<<17, /* __volatile__ */ -+ IFF_ECHO = 1<<18, /* __volatile__ */ -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ -+}; -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */ -+ -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS -+#define IFF_UP IFF_UP -+#define IFF_BROADCAST IFF_BROADCAST -+#define IFF_DEBUG IFF_DEBUG -+#define IFF_LOOPBACK IFF_LOOPBACK -+#define IFF_POINTOPOINT IFF_POINTOPOINT -+#define IFF_NOTRAILERS IFF_NOTRAILERS -+#define IFF_RUNNING IFF_RUNNING -+#define IFF_NOARP IFF_NOARP -+#define IFF_PROMISC IFF_PROMISC -+#define IFF_ALLMULTI IFF_ALLMULTI -+#define IFF_MASTER IFF_MASTER -+#define IFF_SLAVE IFF_SLAVE -+#define IFF_MULTICAST IFF_MULTICAST -+#define IFF_PORTSEL IFF_PORTSEL -+#define IFF_AUTOMEDIA IFF_AUTOMEDIA -+#define IFF_DYNAMIC IFF_DYNAMIC -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS */ -+ -+#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO -+#define IFF_LOWER_UP IFF_LOWER_UP -+#define IFF_DORMANT IFF_DORMANT -+#define IFF_ECHO IFF_ECHO -+#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ -+ -+#define IFF_VOLATILE (IFF_LOOPBACK|IFF_POINTOPOINT|IFF_BROADCAST|IFF_ECHO|\ -+ IFF_MASTER|IFF_SLAVE|IFF_RUNNING|IFF_LOWER_UP|IFF_DORMANT) -+ -+#define IF_GET_IFACE 0x0001 /* for querying only */ -+#define IF_GET_PROTO 0x0002 -+ -+/* For definitions see hdlc.h */ -+#define IF_IFACE_V35 0x1000 /* V.35 serial interface */ -+#define IF_IFACE_V24 0x1001 /* V.24 serial interface */ -+#define IF_IFACE_X21 0x1002 /* X.21 serial interface */ -+#define IF_IFACE_T1 0x1003 /* T1 telco serial interface */ -+#define IF_IFACE_E1 0x1004 /* E1 telco serial interface */ -+#define IF_IFACE_SYNC_SERIAL 0x1005 /* can't be set by software */ -+#define IF_IFACE_X21D 0x1006 /* X.21 Dual Clocking (FarSite) */ -+ -+/* For definitions see hdlc.h */ -+#define IF_PROTO_HDLC 0x2000 /* raw HDLC protocol */ -+#define IF_PROTO_PPP 0x2001 /* PPP protocol */ -+#define IF_PROTO_CISCO 0x2002 /* Cisco HDLC protocol */ -+#define IF_PROTO_FR 0x2003 /* Frame Relay protocol */ -+#define IF_PROTO_FR_ADD_PVC 0x2004 /* Create FR PVC */ -+#define IF_PROTO_FR_DEL_PVC 0x2005 /* Delete FR PVC */ -+#define IF_PROTO_X25 0x2006 /* X.25 */ -+#define IF_PROTO_HDLC_ETH 0x2007 /* raw HDLC, Ethernet emulation */ -+#define IF_PROTO_FR_ADD_ETH_PVC 0x2008 /* Create FR Ethernet-bridged PVC */ -+#define IF_PROTO_FR_DEL_ETH_PVC 0x2009 /* Delete FR Ethernet-bridged PVC */ -+#define IF_PROTO_FR_PVC 0x200A /* for reading PVC status */ -+#define IF_PROTO_FR_ETH_PVC 0x200B -+#define IF_PROTO_RAW 0x200C /* RAW Socket */ -+ -+/* RFC 2863 operational status */ -+enum { -+ IF_OPER_UNKNOWN, -+ IF_OPER_NOTPRESENT, -+ IF_OPER_DOWN, -+ IF_OPER_LOWERLAYERDOWN, -+ IF_OPER_TESTING, -+ IF_OPER_DORMANT, -+ IF_OPER_UP, -+}; -+ -+/* link modes */ -+enum { -+ IF_LINK_MODE_DEFAULT, -+ IF_LINK_MODE_DORMANT, /* limit upward transition to dormant */ -+ IF_LINK_MODE_TESTING, /* limit upward transition to testing */ -+}; -+ -+/* -+ * Device mapping structure. I'd just gone off and designed a -+ * beautiful scheme using only loadable modules with arguments -+ * for driver options and along come the PCMCIA people 8) -+ * -+ * Ah well. The get() side of this is good for WDSETUP, and it'll -+ * be handy for debugging things. The set side is fine for now and -+ * being very small might be worth keeping for clean configuration. -+ */ -+ -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_IFMAP -+struct ifmap { -+ unsigned long mem_start; -+ unsigned long mem_end; -+ unsigned short base_addr; -+ unsigned char irq; -+ unsigned char dma; -+ unsigned char port; -+ /* 3 bytes spare */ -+}; -+#endif /* __UAPI_DEF_IF_IFMAP */ -+ -+struct if_settings { -+ unsigned int type; /* Type of physical device or protocol */ -+ unsigned int size; /* Size of the data allocated by the caller */ -+ union { -+ /* {atm/eth/dsl}_settings anyone ? */ -+ raw_hdlc_proto *raw_hdlc; -+ cisco_proto *cisco; -+ fr_proto *fr; -+ fr_proto_pvc *fr_pvc; -+ fr_proto_pvc_info *fr_pvc_info; -+ x25_hdlc_proto *x25; -+ -+ /* interface settings */ -+ sync_serial_settings *sync; -+ te1_settings *te1; -+ } ifs_ifsu; -+}; -+ -+/* -+ * Interface request structure used for socket -+ * ioctl's. All interface ioctl's must have parameter -+ * definitions which begin with ifr_name. The -+ * remainder may be interface specific. -+ */ -+ -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_IFREQ -+struct ifreq { -+#define IFHWADDRLEN 6 -+ union -+ { -+ char ifrn_name[IFNAMSIZ]; /* if name, e.g. "en0" */ -+ } ifr_ifrn; -+ -+ union { -+ struct sockaddr ifru_addr; -+ struct sockaddr ifru_dstaddr; -+ struct sockaddr ifru_broadaddr; -+ struct sockaddr ifru_netmask; -+ struct sockaddr ifru_hwaddr; -+ short ifru_flags; -+ int ifru_ivalue; -+ int ifru_mtu; -+ struct ifmap ifru_map; -+ char ifru_slave[IFNAMSIZ]; /* Just fits the size */ -+ char ifru_newname[IFNAMSIZ]; -+ void * ifru_data; -+ struct if_settings ifru_settings; -+ } ifr_ifru; -+}; -+#endif /* __UAPI_DEF_IF_IFREQ */ -+ -+#define ifr_name ifr_ifrn.ifrn_name /* interface name */ -+#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */ -+#define ifr_addr ifr_ifru.ifru_addr /* address */ -+#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-p lnk */ -+#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ -+#define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */ -+#define ifr_flags ifr_ifru.ifru_flags /* flags */ -+#define ifr_metric ifr_ifru.ifru_ivalue /* metric */ -+#define ifr_mtu ifr_ifru.ifru_mtu /* mtu */ -+#define ifr_map ifr_ifru.ifru_map /* device map */ -+#define ifr_slave ifr_ifru.ifru_slave /* slave device */ -+#define ifr_data ifr_ifru.ifru_data /* for use by interface */ -+#define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */ -+#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */ -+#define ifr_qlen ifr_ifru.ifru_ivalue /* Queue length */ -+#define ifr_newname ifr_ifru.ifru_newname /* New name */ -+#define ifr_settings ifr_ifru.ifru_settings /* Device/proto settings*/ -+ -+/* -+ * Structure used in SIOCGIFCONF request. -+ * Used to retrieve interface configuration -+ * for machine (useful for programs which -+ * must know all networks accessible). -+ */ -+ -+/* for compatibility with glibc net/if.h */ -+#if __UAPI_DEF_IF_IFCONF -+struct ifconf { -+ int ifc_len; /* size of buffer */ -+ union { -+ char *ifcu_buf; -+ struct ifreq *ifcu_req; -+ } ifc_ifcu; -+}; -+#endif /* __UAPI_DEF_IF_IFCONF */ -+ -+#define ifc_buf ifc_ifcu.ifcu_buf /* buffer address */ -+#define ifc_req ifc_ifcu.ifcu_req /* array of structures */ -+ -+#endif /* _LINUX_IF_H */ --- -2.25.1 - diff --git a/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch b/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch deleted file mode 100644 index f13edbbe50..0000000000 --- a/package/ethtool/0002-marvell.c-Fix-build-with-musl-libc.patch +++ /dev/null @@ -1,71 +0,0 @@ -From a26296eea68aa6c16b253f34825c9b9007269672 Mon Sep 17 00:00:00 2001 -From: Florian Fainelli -Date: Sat, 14 Jan 2023 08:34:11 -0800 -Subject: [PATCH] marvell.c: Fix build with musl-libc - -After commit 1fa60003a8b8 ("misc: header includes cleanup") we stopped -including net/if.h which resolved the proper defines to pull in -sys/types.h and provide a definition for u_int32_t. With musl-libc we -would need to define _GNU_SOURCE to ensure that sys/types.h does provide a -definition for u_int32_t. - -Rather, just replace u_uint{16,32}_t with the more standard -uint{16,32}_t types from stdint.h - -Fixes: 1fa60003a8b8 ("misc: header includes cleanup") -Signed-off-by: Florian Fainelli - -[Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20230114163411.3290201-4-f.fainelli@gmail.com/] -Signed-off-by: Vincent Fazio ---- - marvell.c | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/marvell.c b/marvell.c -index d3d570e..3f3aed8 100644 ---- a/marvell.c -+++ b/marvell.c -@@ -31,23 +31,23 @@ static void dump_timer(const char *name, const void *p) - static void dump_queue(const char *name, const void *a, int rx) - { - struct desc { -- u_int32_t ctl; -- u_int32_t next; -- u_int32_t data_lo; -- u_int32_t data_hi; -- u_int32_t status; -- u_int32_t timestamp; -- u_int16_t csum2; -- u_int16_t csum1; -- u_int16_t csum2_start; -- u_int16_t csum1_start; -- u_int32_t addr_lo; -- u_int32_t addr_hi; -- u_int32_t count_lo; -- u_int32_t count_hi; -- u_int32_t byte_count; -- u_int32_t csr; -- u_int32_t flag; -+ uint32_t ctl; -+ uint32_t next; -+ uint32_t data_lo; -+ uint32_t data_hi; -+ uint32_t status; -+ uint32_t timestamp; -+ uint16_t csum2; -+ uint16_t csum1; -+ uint16_t csum2_start; -+ uint16_t csum1_start; -+ uint32_t addr_lo; -+ uint32_t addr_hi; -+ uint32_t count_lo; -+ uint32_t count_hi; -+ uint32_t byte_count; -+ uint32_t csr; -+ uint32_t flag; - }; - const struct desc *d = a; - --- -2.25.1 - diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index 609085aa5e..846ca7efc3 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 c41fc881ffa5a40432d2dd829eb44c64a49dee482e716baacf9262c64daa8f90 ethtool-6.1.tar.xz +sha256 86df0114064d4d73f6bf72bf03e85c33964a519ee0c1d1ba65005ad2d0e570e1 ethtool-6.2.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index 3381344e0a..a35e274bc4 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 6.1 +ETHTOOL_VERSION = 6.2 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From c4cad5405fdd5def2d713a0bd14dc3c29b7bfb36 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 6 Mar 2023 19:40:50 +0100 Subject: [PATCH 47/66] package/unrar: bump to version 6.2.6 Uptream does not provide a change log. The package now needs a C++11 compiler. For example, the source file "blake2s.hpp" is using the "constexpr" keyword. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/unrar/Config.in | 4 +++- package/unrar/unrar.hash | 2 +- package/unrar/unrar.mk | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/unrar/Config.in b/package/unrar/Config.in index 29696c35aa..8a3def699b 100644 --- a/package/unrar/Config.in +++ b/package/unrar/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_UNRAR bool "unrar" 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 help @@ -8,6 +9,7 @@ config BR2_PACKAGE_UNRAR http://www.rarlab.com/rar_add.htm -comment "unrar needs a toolchain w/ C++, wchar, threads" +comment "unrar needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \ || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/unrar/unrar.hash b/package/unrar/unrar.hash index 40e05a1a32..bc8f986875 100644 --- a/package/unrar/unrar.hash +++ b/package/unrar/unrar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 de75b6136958173fdfc530d38a0145b72342cf0d3842bf7bb120d336602d88ed unrarsrc-6.1.7.tar.gz +sha256 0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318 unrarsrc-6.2.6.tar.gz sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a license.txt diff --git a/package/unrar/unrar.mk b/package/unrar/unrar.mk index fee9fb753b..f59d199558 100644 --- a/package/unrar/unrar.mk +++ b/package/unrar/unrar.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNRAR_VERSION = 6.1.7 +UNRAR_VERSION = 6.2.6 UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz UNRAR_SITE = https://www.rarlab.com/rar UNRAR_LICENSE = unrar @@ -13,7 +13,7 @@ UNRAR_CPE_ID_VENDOR = rarlab define UNRAR_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) CXX="$(TARGET_CXX)" STRIP="/bin/true" \ - CXXFLAGS="$(TARGET_CXXFLAGS) -pthread" \ + CXXFLAGS="$(TARGET_CXXFLAGS) -pthread -std=c++11" \ LDFLAGS="$(TARGET_LDFLAGS) -pthread" -C $(@D) endef From 3e48f8358e519f9c24262a6549d8f6c78ee01add Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 6 Mar 2023 22:14:35 +0100 Subject: [PATCH 48/66] package/gsl: bump to version 2.7.1 For change log since 2.6, see: https://git.savannah.gnu.org/cgit/gsl.git/tree/NEWS?h=release-2-7 This 2.7.1 version includes a minor libtool version fixup on top of 2.7: https://git.savannah.gnu.org/cgit/gsl.git/commit/?id=77e7c7d008707dace56626020eaa6181912e9841 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/gsl/gsl.hash | 2 +- package/gsl/gsl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gsl/gsl.hash b/package/gsl/gsl.hash index 0d40a75497..153ae4131d 100644 --- a/package/gsl/gsl.hash +++ b/package/gsl/gsl.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8 gsl-2.6.tar.gz +sha256 dcb0fbd43048832b757ff9942691a8dd70026d5da0ff85601e52687f6deeb34b gsl-2.7.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index 3604f9836c..575cb75462 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSL_VERSION = 2.6 +GSL_VERSION = 2.7.1 GSL_SITE = $(BR2_GNU_MIRROR)/gsl GSL_INSTALL_STAGING = YES GSL_LICENSE = GPL-3.0 From af2cfc61a2a3e630824ac693d961b74f858c0407 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 12 Mar 2023 10:22:15 +0100 Subject: [PATCH 49/66] package/pcre2: update _SITE url The pcre2 url [1] is now redirecting to [2]. This change was announced in upstream commit [3] which was already included in pcre2 10.41. This commit updates the PCRE2_SITE url accordingly. The package version remains unchanged. [1] https://github.com/PhilipHazel/pcre2 [2] https://github.com/PCRE2Project/pcre2 [3] https://github.com/PCRE2Project/pcre2/commit/66b3cb34dfe5411cb2bb939a8f4981081815d496 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/pcre2/pcre2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index aba378cab6..c35056f8a2 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -5,7 +5,7 @@ ################################################################################ PCRE2_VERSION = 10.42 -PCRE2_SITE = https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$(PCRE2_VERSION) +PCRE2_SITE = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause PCRE2_LICENSE_FILES = LICENCE From 69053186c9f1561855357be574c70c0b3ad0ddcb Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 1 Mar 2023 23:01:58 +0100 Subject: [PATCH 50/66] package/kexec: bump to version 2.0.26 See release announce: https://lists.infradead.org/pipermail/kexec/2022-December/026399.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 34e17339b9..4e16a53a35 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 7ce2e5def38ec04f79feb107d02243dd586fbc68569eccf02f44bad3a13ec07d kexec-tools-2.0.25.tar.xz +sha256 7fe36a064101cd5c515e41b2be393dce3ca88adce59d6ee668e0af7c0c4570cd kexec-tools-2.0.26.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index ced7009ed3..c1411f6ab7 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.25 +KEXEC_VERSION = 2.0.26 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 From af9769ad23c67f9bd4d1b038709d41230501efef Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Wed, 1 Mar 2023 10:22:53 +0100 Subject: [PATCH 51/66] package/htpdate: bump to version 1.3.7 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/htpdate/htpdate.hash | 2 +- package/htpdate/htpdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/htpdate/htpdate.hash b/package/htpdate/htpdate.hash index f572fb1e84..b711773af5 100644 --- a/package/htpdate/htpdate.hash +++ b/package/htpdate/htpdate.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 3cdc558ec8e53ef374a42490b2f28c0b23981fa8754a6d7182044707828ad1e9 htpdate-1.3.6.tar.gz +sha256 88c52fe475308ee95f560fd7cf68c75bc6e9a6abf56be7fed203a7f762fe7ab2 htpdate-1.3.7.tar.gz sha256 7989949df09a0489434723c571541604cd3f2e0418c6a6aa9179bfaf8ec807cc LICENSE diff --git a/package/htpdate/htpdate.mk b/package/htpdate/htpdate.mk index 2d4a11dd9d..20be904d3d 100644 --- a/package/htpdate/htpdate.mk +++ b/package/htpdate/htpdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -HTPDATE_VERSION = 1.3.6 +HTPDATE_VERSION = 1.3.7 HTPDATE_SITE = $(call github,twekkel,htpdate,v$(HTPDATE_VERSION)) HTPDATE_LICENSE = GPL-2.0+ HTPDATE_LICENSE_FILES = LICENSE From f69c972ae613719c0ebc5395ba3084c408023102 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 3 Mar 2023 23:26:58 +0100 Subject: [PATCH 52/66] support/testing/tests/package/test_kexec.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + support/testing/tests/package/test_kexec.py | 93 +++++++++++++++++++ .../package/test_kexec/linux-kexec.fragment | 5 + 3 files changed, 100 insertions(+) create mode 100644 support/testing/tests/package/test_kexec.py create mode 100644 support/testing/tests/package/test_kexec/linux-kexec.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 7733d5a04e..f6e120d92b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1718,6 +1718,8 @@ F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_kexec.py +F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_libjxl.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_ncdu.py diff --git a/support/testing/tests/package/test_kexec.py b/support/testing/tests/package/test_kexec.py new file mode 100644 index 0000000000..77e383373e --- /dev/null +++ b/support/testing/tests/package/test_kexec.py @@ -0,0 +1,93 @@ +import os + +import infra.basetest + + +class TestKexec(infra.basetest.BRTest): + + # A specific configuration is needed for using kexec: + # - We use Aarch64 since it is well supported for kexec, + # - A kernel config fragment enables all the kexec parts, + # - The kernel Image is installed on target filesystem to be + # reloaded through kexec, + # - We use a ext4 rootfs image exposed as a virtio storage (rather + # than cpio initrd). This avoids needing to install the initrd + # inside the rootfs. + 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="6.1.15" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}" + BR2_LINUX_KERNEL_INSTALL_TARGET=y + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_KEXEC=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """.format( + infra.filepath("tests/package/test_kexec/linux-kexec.fragment") + ) + + def test_run(self): + hda = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + # Notes: + # Sufficient memory is needed to load the kernel: having at + # least 512MB works. kexec could silently fail if not enough + # memory is present. KASLR needs to be disabled for the test: + # we pass "nokaslr" to kernel bootargs, and also pass + # "dtb-kaslr-seed=off" to qemu virt machine. + bootargs = ["root=/dev/vda console=ttyAMA0 nokaslr"] + qemu_opts = ["-M", "virt,dtb-kaslr-seed=off", "-cpu", "cortex-a57", "-m", "512M", + "-drive", f"file={hda},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # Test the program can execute + self.assertRunOk("kexec --version") + + # Check the kexec kernel is NOT loaded: + self.assertRunOk("test \"$(cat /sys/kernel/kexec_loaded)\" -eq 0") + + # Load the Kernel: + # "--append br-test" adds a dummy kernel args we'll be able to + # check in the second executed kernel. + # We use the dtb image from /sys/firmware/fdt (since we don't + # have the dtb file in the system) + self.assertRunOk("kexec -d -l --dtb=/sys/firmware/fdt --reuse-cmdline --serial=ttyAMA0 --append=br-test /boot/Image") + + # Check the kexec kernel IS loaded: + self.assertRunOk("test \"$(cat /sys/kernel/kexec_loaded)\" -eq 1") + + # Create a marker file in tmpfs which is supposed to disappear + # after kexec kernel restart. + self.assertRunOk("touch /dev/shm/br-kexec-marker") + + # Execute the loaded kernel (i.e perform a kexec reboot) + # qemu.sendline() is used here because no exit code nor + # program return is expected, since kexec is like a + # reboot. The login is expected to be reached after the + # command is issued. + self.emulator.qemu.sendline("kexec -d -e") + + # Wait for the login, and log again + self.emulator.login() + + # Check the "br-test" dummy kernel arg is present + self.assertRunOk("grep br-test /proc/cmdline") + + # Check the test marker file is no longer here + self.assertRunOk("test ! -e /dev/shm/br-kexec-marker") + + # After restart, the kernel is not supposed to have a kexec + # loaded image: + self.assertRunOk("test \"$(cat /sys/kernel/kexec_loaded)\" -eq 0") diff --git a/support/testing/tests/package/test_kexec/linux-kexec.fragment b/support/testing/tests/package/test_kexec/linux-kexec.fragment new file mode 100644 index 0000000000..04c65f5cae --- /dev/null +++ b/support/testing/tests/package/test_kexec/linux-kexec.fragment @@ -0,0 +1,5 @@ +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +CONFIG_PROC_KCORE=y +CONFIG_DEBUG_KERNEL=y +CONFIG_KALLSYMS_ALL=y From f1c5671ffef3d68979f6514a687815abd4c1f357 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 14:35:16 +0100 Subject: [PATCH 53/66] package/ola: bump to version 0.10.9 For change log, see: https://github.com/OpenLightingProject/ola/releases/tag/0.10.9 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/ola/ola.hash | 2 +- package/ola/ola.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ola/ola.hash b/package/ola/ola.hash index 7565adabde..a1a5577ed3 100644 --- a/package/ola/ola.hash +++ b/package/ola/ola.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 102aa3114562a2a71dbf7f77d2a0fb9fc47acc35d6248a70b6e831365ca71b13 ola-0.10.8.tar.gz +sha256 44073698c147fe641507398253c2e52ff8dc7eac8606cbf286c29f37939a4ebf ola-0.10.9.tar.gz # License files (locally computed) sha256 e6b95dd336a57abb343e2988ac22b7e21b35c5b86003e6eb9e066ffbeeff9da7 COPYING diff --git a/package/ola/ola.mk b/package/ola/ola.mk index 82615e8155..efaa5b6e3e 100644 --- a/package/ola/ola.mk +++ b/package/ola/ola.mk @@ -4,7 +4,7 @@ # ################################################################################ -OLA_VERSION = 0.10.8 +OLA_VERSION = 0.10.9 OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) OLA_LICENSE = LGPL-2.1+ (libola, libolacommon, Python bindings), GPL-2.0+ (libolaserver, olad, Python examples and tests) OLA_LICENSE_FILES = COPYING GPL LGPL LICENCE From 06fa870d7e8ba385de00e64116df74c1e3b9b31a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 17:31:00 +0100 Subject: [PATCH 54/66] package/iperf3: bump to version 3.13 LICENSE file hash changed, due to year update. For change log, see: https://github.com/esnet/iperf/blob/3.13/RELNOTES.md#iperf-313-2023-02-16 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/iperf3/iperf3.hash | 6 +++--- package/iperf3/iperf3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 15c75b6dac..b2c89df98a 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.12.tar.gz.sha256 -sha256 72034ecfb6a7d6d67e384e19fb6efff3236ca4f7ed4c518d7db649c447e1ffd6 iperf-3.12.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.13.tar.gz.sha256 +sha256 bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865 iperf-3.13.tar.gz # Locally computed -sha256 a5c2e3d799f2835156e565a3de4fad33d32ed289cdc9e414dfaf75719fd12ef9 LICENSE +sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 9041c86575..129319d78a 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.12 +IPERF3_VERSION = 3.13 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT From 620098889f74ad924676fca7d8d56eb401a7d0be Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 17:31:01 +0100 Subject: [PATCH 55/66] support/testing/tests/package/test_iperf3.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + support/testing/tests/package/test_iperf3.py | 23 ++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 support/testing/tests/package/test_iperf3.py diff --git a/DEVELOPERS b/DEVELOPERS index f6e120d92b..ff26021d1d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1718,6 +1718,7 @@ F: support/testing/tests/package/sample_python_spake2.py F: support/testing/tests/package/test_gnupg2.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py +F: support/testing/tests/package/test_iperf3.py F: support/testing/tests/package/test_kexec.py F: support/testing/tests/package/test_kexec/ F: support/testing/tests/package/test_libjxl.py diff --git a/support/testing/tests/package/test_iperf3.py b/support/testing/tests/package/test_iperf3.py new file mode 100644 index 0000000000..9aac4c6fd0 --- /dev/null +++ b/support/testing/tests/package/test_iperf3.py @@ -0,0 +1,23 @@ +import os + +import infra.basetest + + +class TestIperf3(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IPERF3=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() + + self.assertRunOk("iperf3 --version") + self.assertRunOk("iperf3 -s -D") + self.assertRunOk("iperf3 -c 127.0.0.1 -t 3") From ce952170e1e8229da0bdac81566a627a87e56bee Mon Sep 17 00:00:00 2001 From: Casey Reeves Date: Sun, 26 Feb 2023 12:33:08 +0100 Subject: [PATCH 56/66] package/lzop: bump to version 1.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lzop 1.04 uses libtool 2.4.2.418, which is right between 2.4.2 and 2.4.4. While our patch for 2.4 is also supposed to work up to and including 2.4.2.x, it does not work for libtool 2.4.2.418, which requires the patch for 2.4.4. We could change our infra to better pick the appropriate patch, but we do not know exactly which 2.4.2.x version is actually the cutting point that requires the 2.4.4 patch. Until we have more data point, let's handle the case in an ad-hoc manner for lzop. Additionally, we add a patch from Florian Bäuerle, which allows to set the mtime of the lzop archive for reproducible build support using SOURCE_DATE_EPOCH. Signed-off-by: Casey Reeves Signed-off-by: Thomas Petazzoni --- ...1-allow-overriding-modification-time.patch | 42 ++++++++ package/lzop/0001-build-with-gcc6.patch | 37 ------- ...es-as-the-external-inline-definition.patch | 102 ------------------ package/lzop/lzop.hash | 2 +- package/lzop/lzop.mk | 15 ++- 5 files changed, 57 insertions(+), 141 deletions(-) create mode 100644 package/lzop/0001-allow-overriding-modification-time.patch delete mode 100644 package/lzop/0001-build-with-gcc6.patch delete mode 100644 package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch diff --git a/package/lzop/0001-allow-overriding-modification-time.patch b/package/lzop/0001-allow-overriding-modification-time.patch new file mode 100644 index 0000000000..5ffc64cd30 --- /dev/null +++ b/package/lzop/0001-allow-overriding-modification-time.patch @@ -0,0 +1,42 @@ +From: =?UTF-8?q?Florian=20B=C3=A4uerle?= +Date: Thu, 25 Oct 2018 17:26:30 +0200 +Subject: [PATCH] allow overriding modification time + +This patch allows to set the mtime of the lzop archive to +$SOURCE_DATE_EPOCH, required for reproducible build. It was submitted to +pengutronix by florian Bäuerle in october 2018. + +https://git.pengutronix.de/cgit/ptxdist/tree/patches/lzop-1.04/0002-allow-overriding-modification-time.patch + +Signed-off-by: Casey Reeves +--- + src/lzop.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/lzop.c b/src/lzop.c +index a540ad9c4d33..c2f877d16f92 100644 +--- a/src/lzop.c ++++ b/src/lzop.c +@@ -712,6 +712,7 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + assert(opt_method > 0); + assert(opt_level > 0); + assert(fip->st.st_mode == 0 || S_ISREG(fip->st.st_mode)); ++ const char *source_date_epoch = getenv("SOURCE_DATE_EPOCH"); + + memset(h,0,sizeof(header_t)); + +@@ -748,7 +749,13 @@ void init_compress_header(header_t *h, const file_t *fip, const file_t *fop) + + h->mode = fix_mode_for_header(fip->st.st_mode); + +- if (fip->st.st_mtime > 0) ++ if (source_date_epoch) ++ { ++ time_t mtime = strtoul(source_date_epoch, NULL, 0); ++ h->mtime_low = (lzo_uint32) (mtime); ++ h->mtime_high = (lzo_uint32) ((mtime >> 16) >> 16); ++ } ++ else if (fip->st.st_mtime > 0) + { + h->mtime_low = (lzo_uint32) (fip->st.st_mtime); + h->mtime_high = (lzo_uint32) ((fip->st.st_mtime >> 16) >> 16); diff --git a/package/lzop/0001-build-with-gcc6.patch b/package/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 03bd887d51..0000000000 --- a/package/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7..0000000000 --- a/package/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package/lzop/lzop.hash b/package/lzop/lzop.hash index adc20648b6..99796dc8c9 100644 --- a/package/lzop/lzop.hash +++ b/package/lzop/lzop.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz +sha256 7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41 lzop-1.04.tar.gz sha256 70439f6e2b47057a408d2390ed6663b9875f5a08066a06a060a357ef1df89a8c COPYING diff --git a/package/lzop/lzop.mk b/package/lzop/lzop.mk index 55157c4d48..d32d2d1d3b 100644 --- a/package/lzop/lzop.mk +++ b/package/lzop/lzop.mk @@ -4,13 +4,26 @@ # ################################################################################ -LZOP_VERSION = 1.03 +LZOP_VERSION = 1.04 LZOP_SITE = http://www.lzop.org/download LZOP_LICENSE = GPL-2.0+ LZOP_LICENSE_FILES = COPYING LZOP_DEPENDENCIES = lzo HOST_LZOP_DEPENDENCIES = host-lzo +# lzop uses libtool 2.4.2.418, which is right between 2.4.2 and +# 2.4.4. While our patch for 2.4 is also supposed to work up to and +# including 2.4.2.x, it does not work for libtool 2.4.2.418, which +# requires the patch for 2.4.4. So we disable the libtool patching +# from autotools-package and do our own. +LZOP_LIBTOOL_PATCH = NO + +define LZOP_LIBTOOL_FIXUP + patch -i support/libtool/buildroot-libtool-v2.4.4.patch $(@D)/autoconf/ltmain.sh +endef +LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP +HOST_LZOP_POST_PATCH_HOOKS += LZOP_LIBTOOL_FIXUP + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 38c581b05cd8e7967783410b36c14b9b561acd12 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 26 Feb 2023 14:18:38 +0100 Subject: [PATCH 57/66] configs/spike_riscv64: bump kernel to 6.1.14 Linux Kernel 6.1 now being officially promoted to be a LTS, this commit bump the kernel version of this defconfig to 6.1.14. A Kernel config fragment "linux.fragment" is now needed as the kernel no longer enable SBI v0.1 support and the earlycon RISC-V SBI in its riscv arch defconfig. See [1] [2]. The Spike riscv-isa-sim was updated upstream accordingly [3]. In order to keep a smooth transition, this kernel config fragment re-enable those options to make sure this kernel will work with both old Spike versions (not including commit [3] like the v1.1.0 currently included in Buildroot), and newer versions. This commit was also successfully tested with riscv-isa-sim at commit 0d1a48c0c0. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6f562570b9c5d6a3e30d87aec60a9d8f22a3203c [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3938d5a2f9369d1ebd56320629fed395ce327e9c [3] https://github.com/riscv-software-src/riscv-isa-sim/commit/191634d2854dfed448fc323195f9b65c305e2d77 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- board/spike/riscv64/linux.fragment | 3 +++ configs/spike_riscv64_defconfig | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 board/spike/riscv64/linux.fragment diff --git a/board/spike/riscv64/linux.fragment b/board/spike/riscv64/linux.fragment new file mode 100644 index 0000000000..b443b0ab36 --- /dev/null +++ b/board/spike/riscv64/linux.fragment @@ -0,0 +1,3 @@ +CONFIG_RISCV_SBI_V01=y +CONFIG_HVC_RISCV_SBI=y +CONFIG_SERIAL_EARLYCON_RISCV_SBI=y diff --git a/configs/spike_riscv64_defconfig b/configs/spike_riscv64_defconfig index e23f1ce32c..73ea566084 100644 --- a/configs/spike_riscv64_defconfig +++ b/configs/spike_riscv64_defconfig @@ -2,9 +2,10 @@ BR2_riscv=y BR2_RISCV_64=y BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.86" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.14" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/spike/riscv64/linux.fragment" +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_OPENSBI=y From a1f00209c20e6d5fc2712c8b4746f3ac5d94df7f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 4 Mar 2023 20:49:27 +0100 Subject: [PATCH 58/66] package/harfbuzz: bump to version 7.1.0 Since the major release changed all the packages that have direct dependency to harfbuzz has been succesfully built: - efl - libass - mupdf - pango - qt5base - qt5webengine - qt6base - sdl2_ttf - supertuxkart - vlc - webkitgtk - wpewebkit Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index 9489f25c6a..e881f58510 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d harfbuzz-5.3.1.tar.xz +sha256 f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b harfbuzz-7.1.0.tar.xz sha256 4345e1735f8bc6d812fed5180cabb5a5e88a4109d332652f2a45c13cfa5ee692 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index b0112168e1..24c6f3ef27 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 5.3.1 +HARFBUZZ_VERSION = 7.1.0 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From 0a46e6c1981c9a326c7cd3713bd312f9f9bc8f99 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 19:53:41 +0100 Subject: [PATCH 59/66] package/mtools: bump to version 4.0.42 Release announce: https://lists.gnu.org/archive/html/info-mtools/2022-10/msg00000.html For change log since 4.0.38, see: https://svn.savannah.gnu.org/viewvc/mtools/tags/4.0.42/NEWS?view=markup Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/mtools/mtools.hash | 2 +- package/mtools/mtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mtools/mtools.hash b/package/mtools/mtools.hash index a162bfdc95..b81830a7d2 100644 --- a/package/mtools/mtools.hash +++ b/package/mtools/mtools.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 7086821b399a39b8a3c5a372d064de4860f3c195b4911dd4e8b76219fcabe75c mtools-4.0.38.tar.lz +sha256 40a98fd9bcc865997866015013c3c64a304d98c2892fe4ab892ffd6ac3dd9bae mtools-4.0.42.tar.lz # Locally calculated sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk index c875814bc7..407ac1a2c6 100644 --- a/package/mtools/mtools.mk +++ b/package/mtools/mtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTOOLS_VERSION = 4.0.38 +MTOOLS_VERSION = 4.0.42 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.lz MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools MTOOLS_LICENSE = GPL-3.0+ From c6c79d6d40e37fada0c50430f27b9aeaf68bae74 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 1 Mar 2023 00:55:47 +0100 Subject: [PATCH 60/66] package/{bluez5_utils, bluez5_utils-headers}: bump to version 5.66 bluez 5.66 contains various fixes and initial support for Basic Audio Profile and Volume Control Profile. Signed-off-by: Stefan Agner Signed-off-by: Thomas Petazzoni --- 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 565511120f..8ca3764935 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.65 +BLUEZ5_UTILS_HEADERS_VERSION = 5.66 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 e0c9f3cdb9..9467647592 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 2565a4d48354b576e6ad92e25b54ed66808296581c8abb80587051f9993d96d4 bluez-5.65.tar.xz +sha256 39fea64b590c9492984a0c27a89fc203e1cdc74866086efb8f4698677ab2b574 bluez-5.66.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 76070dc3a9..4059b34556 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.65 +BLUEZ5_UTILS_VERSION = 5.66 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES From bcf9d2f51cd5c80191b63020412631a548e32a7d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 28 Feb 2023 21:27:20 +0100 Subject: [PATCH 61/66] package/openmpi: bump to version 4.1.5 For change log, see: https://github.com/open-mpi/ompi/blob/v4.1.5/NEWS#L61 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/openmpi/openmpi.hash | 6 +++--- package/openmpi/openmpi.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/openmpi/openmpi.hash b/package/openmpi/openmpi.hash index 745ed7c580..567ffe4833 100644 --- a/package/openmpi/openmpi.hash +++ b/package/openmpi/openmpi.hash @@ -1,6 +1,6 @@ # From: https://www.open-mpi.org/software/ompi/v4.1/ -md5 f057e12aabaf7dd5a6a658180fca404e openmpi-4.1.4.tar.bz2 -sha1 357c61a8e06e103d987c0e4a054e8780a034c8b1 openmpi-4.1.4.tar.bz2 -sha256 92912e175fd1234368c8730c03f4996fe5942e7479bb1d10059405e7f2b3930d openmpi-4.1.4.tar.bz2 +md5 bb045df2d600744c2231c78b31a20da3 openmpi-4.1.5.tar.bz2 +sha1 eba2e6f9ee0c39fbca0a8cf53a79c9ed29643284 openmpi-4.1.5.tar.bz2 +sha256 a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3 openmpi-4.1.5.tar.bz2 # Locally computed sha256 2db71de9577ebfe15c186605844c470dcecd3717f4ef0118c9440d801c0f58f8 LICENSE diff --git a/package/openmpi/openmpi.mk b/package/openmpi/openmpi.mk index f14b55ced5..82a4b3eb1c 100644 --- a/package/openmpi/openmpi.mk +++ b/package/openmpi/openmpi.mk @@ -5,7 +5,7 @@ ################################################################################ OPENMPI_VERSION_MAJOR = 4.1 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).4 +OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).5 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 OPENMPI_LICENSE = BSD-3-Clause @@ -15,7 +15,7 @@ OPENMPI_INSTALL_STAGING = YES # The macro searching for IME (Infinite Memory Engine) filesystem # brings "-I/usr/local/include" in the CPPFLAGS, even if not # found. This makes the configuration fail. See: -# https://github.com/open-mpi/ompi/blob/v4.1.4/config/ompi_check_ime.m4#L35 +# https://github.com/open-mpi/ompi/blob/v4.1.5/config/ompi_check_ime.m4#L35 # Disable explicitly to avoid the issue. OPENMPI_CONF_OPTS = --without-ime From 9c3cdee11a21380f8141ec4379f8a67dea4481a7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 12 Mar 2023 20:27:31 +0100 Subject: [PATCH 62/66] support/testing/tests/package/test_shadow.py: drop blank line at end of file Fixes: support/testing/tests/package/test_shadow.py:55:1: W391 blank line at end of file 1 W391 blank line at end of file make: *** [Makefile:1253: check-flake8] Error 123 https://gitlab.com/buildroot.org/buildroot/-/jobs/3918132888 Signed-off-by: Thomas Petazzoni --- support/testing/tests/package/test_shadow.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/test_shadow.py b/support/testing/tests/package/test_shadow.py index c5151b4fdb..09b580de59 100644 --- a/support/testing/tests/package/test_shadow.py +++ b/support/testing/tests/package/test_shadow.py @@ -52,4 +52,3 @@ class TestShadow(BRTest): self.assertRunOk(f'usermod {username} --home {new_home}') self.assertRunOk(f'test $(su {username} -c \'echo $HOME\') = {new_home}') self.assertRunOk(f'userdel {username}') - From f50259d6a0c0e8ba2149aea04c7dc98fe4707abb Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 28 Feb 2023 08:20:36 +0100 Subject: [PATCH 63/66] package/dbus-broker: bump to release 33 This release contains mostly a bugfixes, with some improvements around error handling for unimplemented functionality and resiliency against runtime changes of dbus service-files. Also update hashes of license files. There was no change in license, the hashes changed due to copyright date bump and additional authors listend in the same files. Signed-off-by: Stefan Agner Signed-off-by: Thomas Petazzoni --- package/dbus-broker/dbus-broker.hash | 6 +++--- package/dbus-broker/dbus-broker.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dbus-broker/dbus-broker.hash b/package/dbus-broker/dbus-broker.hash index f6c2cbe160..06c8f229b7 100644 --- a/package/dbus-broker/dbus-broker.hash +++ b/package/dbus-broker/dbus-broker.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de dbus-broker-32.tar.xz +sha256 23713f25624749fdb274907e429080fa2d8f4dbe76acd87bb6d21a3c818c7841 dbus-broker-33.tar.xz sha256 3cda3630283eda0eab825abe5ac84d191248c6b3fe1c232a118124959b96c6a4 LICENSE sha256 20ea1f96abc15553695c6725bb3dcabff4b43b85b7ca7d675a2b8860e3b01f87 subprojects/libcdvar-1/AUTHORS sha256 8153c478102dc209b30dd4627cf5bb3596263f99692bf3eec174b1e17bbf8a3b subprojects/libcdvar-1/README.md @@ -11,7 +11,7 @@ sha256 23f24eeaaded5fedd6e7840b6f7b73838f9a4e2112ad6a12fe1ef958f73d0214 subpro sha256 05113a24aca4c537819dd0d91b95b13edb85bea4b6a77a6d9269becb397ed374 subprojects/libcrbtree-3/README.md sha256 6d63b1fb794d4c02622595ad30357c90398aa883864e5a275479139c8f03208f subprojects/libcshquote-1/AUTHORS sha256 cad109dd33062518a437ebee145ba863fe0e047d4e3db9c28b0bf3c6148f10c2 subprojects/libcshquote-1/README.md -sha256 32913ba08dc041f3f4ca361fc0d68014120e1c612772aabbcc901556df499ce5 subprojects/libcstdaux-1/AUTHORS -sha256 7c4b6c325b0bc02150089112f65132ee999b0f44500b73d1fc06d96c93161037 subprojects/libcstdaux-1/README.md +sha256 e796182869fe0892347d069f3f423774124987d6c45d016854fc51530633c177 subprojects/libcstdaux-1/AUTHORS +sha256 92006886d7f28894fef08bf97e35ef52147067bd3c4d4d6381da7c59f9901dae subprojects/libcstdaux-1/README.md sha256 7e660796fea0400a1a9a539226c345b3c656a745a334e323e33258de7864e985 subprojects/libcutf8-1/AUTHORS sha256 106099cc1c488cbf8911f56da7977a955f6b27a7bb5b815985e59d9fae0e6fe7 subprojects/libcutf8-1/README.md diff --git a/package/dbus-broker/dbus-broker.mk b/package/dbus-broker/dbus-broker.mk index e82b79220d..c4e3679a2e 100644 --- a/package/dbus-broker/dbus-broker.mk +++ b/package/dbus-broker/dbus-broker.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_BROKER_VERSION = 32 +DBUS_BROKER_VERSION = 33 DBUS_BROKER_SOURCE = dbus-broker-$(DBUS_BROKER_VERSION).tar.xz DBUS_BROKER_SITE = https://github.com/bus1/dbus-broker/releases/download/v$(DBUS_BROKER_VERSION) From 30e96518cd7255048bcac024c20e203f51c377d4 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 27 Feb 2023 21:53:33 +0100 Subject: [PATCH 64/66] support/testing/tests/package/test_stress_ng.py: new runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + .../testing/tests/package/test_stress_ng.py | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 support/testing/tests/package/test_stress_ng.py diff --git a/DEVELOPERS b/DEVELOPERS index ff26021d1d..e28b46967c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1736,6 +1736,7 @@ F: support/testing/tests/package/test_python_pyalsa.py F: support/testing/tests/package/test_python_spake2.py F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ +F: support/testing/tests/package/test_stress_ng.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ diff --git a/support/testing/tests/package/test_stress_ng.py b/support/testing/tests/package/test_stress_ng.py new file mode 100644 index 0000000000..12fd6ec9e6 --- /dev/null +++ b/support/testing/tests/package/test_stress_ng.py @@ -0,0 +1,22 @@ +import os + +import infra.basetest + + +class TestStressNG(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_STRESS_NG=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() + + self.assertRunOk("stress-ng --version") + self.assertRunOk("stress-ng --cpu 1 --timeout 3") From 00553ea186357fd3e2b3c89fa560e9711cc67472 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 27 Feb 2023 21:53:34 +0100 Subject: [PATCH 65/66] package/stress-ng: bump to version V0.15.04 This commit dropped the patch, included upstream in: https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545 which was included in V0.14.04. Three patches are also introduced to fix build issues (all upstream not but not yet in version). Also, this new version now depends on BR2_TOOLCHAIN_HAS_SYNC_4. Finally, a new _MAKE_FLAGS is introduced to prevent the package to modify too much its CFLAGS. For change log since V0.13.05, see: - https://github.com/ColinIanKing/stress-ng/blob/V0.15.04/debian/changelog or commit logs: - https://github.com/ColinIanKing/stress-ng/commits/V0.15.04 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...1-Makefile-fix-build-with-kernel-5.6.patch | 60 -------------- ...build-with-HAVE_SYSCALL-or-__NR_mmap.patch | 54 +++++++++++++ ...002-stress-regs-fix-build-on-riscv32.patch | 43 ++++++++++ ...introduce-PRESERVE_CFLAGS-build-flag.patch | 78 +++++++++++++++++++ package/stress-ng/Config.in | 2 + package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 7 +- 7 files changed, 183 insertions(+), 63 deletions(-) delete mode 100644 package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch create mode 100644 package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch create mode 100644 package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch create mode 100644 package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch diff --git a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch b/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch deleted file mode 100644 index 4c62da3241..0000000000 --- a/package/stress-ng/0001-Makefile-fix-build-with-kernel-5.6.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5d419c790e648c7a2f96f34ed1b93b326f725545 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 13 Aug 2022 17:17:05 +0200 -Subject: [PATCH] Makefile: fix build with kernel < 5.6 - -Fix the following build failure with kernel >= 5.1 and < 5.5 (i.e. -before -https://github.com/torvalds/linux/commit/9e3aa61ae3e01ce1ce6361a41ef725e1f4d1d2bf) -raised since version 0.11.21 and -https://github.com/ColinIanKing/stress-ng/commit/3d6fccdbe53d0cbcb75dd4b91571aaaae7ee1ad4: - -In file included from stress-io-uring.c:26: -io-uring.h:1:9: error: macro names must be identifiers - 1 | #define #define HAVE_IORING_OP_NOP 0 - | ^ - -Moreover, IORING_OP_FALLOCATE is not available before kernel 5.6 and -https://github.com/torvalds/linux/commit/d63d1b5edb7b832210bfde587ba9e7549fa064eb - -Fixes: - - http://autobuild.buildroot.org/results/1bf3f2bbc849bdce531d56b1024fa87f0c1ae667 - -Signed-off-by: Fabrice Fontaine -[Retrieved (and backported) from -https://github.com/ColinIanKing/stress-ng/commit/5d419c790e648c7a2f96f34ed1b93b326f725545] ---- - Makefile | 2 +- - stress-io-uring.c | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 2f9cc9918..ee17ae08b 100644 ---- a/Makefile -+++ b/Makefile -@@ -528,7 +528,7 @@ stress-personality.c: personality.h - # - io-uring.h: - $(V)$(CPP) $(CFLAGS) core-io-uring.c | $(GREP) IORING_OP | sed 's/,//' | \ -- sed 's/IORING_OP_/#define HAVE_IORING_OP_/' > io-uring.h -+ sed 's/.*\(IORING_OP_.*\)/#define HAVE_\1/' > io-uring.h - $(Q)echo "MK io-uring.h" - - stress-io-uring.c: io-uring.h -diff --git a/stress-io-uring.c b/stress-io-uring.c -index ab9fd0749..84f463611 100644 ---- a/stress-io-uring.c -+++ b/stress-io-uring.c -@@ -311,7 +311,11 @@ static inline int stress_io_uring_complete( - break; - - cqe = &cring->cqes[head & *submit->cq_ring.ring_mask]; -- if ((cqe->res < 0) && (opcode != IORING_OP_FALLOCATE)) { -+ if ((cqe->res < 0) -+#ifdef HAVE_IORING_OP_FALLOCATE -+ && (opcode != IORING_OP_FALLOCATE) -+#endif -+ ) { - const int err = abs(cqe->res); - - /* Silently ignore EOPNOTSUPP completion errors */ diff --git a/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch b/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch new file mode 100644 index 0000000000..41a2647133 --- /dev/null +++ b/package/stress-ng/0001-stress-mmap-fix-build-with-HAVE_SYSCALL-or-__NR_mmap.patch @@ -0,0 +1,54 @@ +From 625dd7e458e6aa488f7dd4764e4a62b6fbf79a9d Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Thu, 23 Feb 2023 21:54:16 +0100 +Subject: [PATCH] stress-mmap: fix build with HAVE_SYSCALL or __NR_mmap2 is + undefined + +Commit afae500a added macro tests for defined(HAVE_SYSCALL) and +system call numbers. + +More specifically, in stress-mmap.c, function mmap2_try() was defined +only if __NR_mmap2 is defined. See: +https://github.com/ColinIanKing/stress-ng/commit/afae500a23b198b9df421ad0fd9270fcdf65c3fb#diff-ffb0db2473f6c5e1b93dd33bce389ee836671a628fff9f903d097733f7ddfc9c + +This commit forgot to replicate the same test when the mmap2_try() +function is used later at: +https://github.com/ColinIanKing/stress-ng/blob/50f3ef2560e928c4694894be0bb652e663af5076/stress-mmap.c#L754 + +When HAVE_SYSCALL or __NR_mmap2 is undefined, compilation fails with: + + stress-mmap.c: In function 'stress_mmap': + stress-mmap.c:809:31: error: 'mmap2_try' undeclared (first use in this function); did you mean 'mmap_prot'? + context.mmap = (mmap_func_t)mmap2_try; + ^~~~~~~~~ + mmap_prot + stress-mmap.c:809:31: note: each undeclared identifier is reported only once for each function it appears in + +This patch fixes this issue. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/3da49180fdfa8a70307569202ed9431f5295913e + +Signed-off-by: Julien Olivain +--- + stress-mmap.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/stress-mmap.c b/stress-mmap.c +index cf343078..68f5a9b8 100644 +--- a/stress-mmap.c ++++ b/stress-mmap.c +@@ -805,7 +805,9 @@ static int stress_mmap(const stress_args_t *args) + context.mmap_file = true; + + if (mmap_mmap2) { +-#if defined(HAVE_MMAP2) ++#if defined(HAVE_MMAP2) && \ ++ defined(HAVE_SYSCALL) && \ ++ defined(__NR_mmap2) + context.mmap = (mmap_func_t)mmap2_try; + #else + if (args->instance == 0) +-- +2.39.2 + diff --git a/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch b/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch new file mode 100644 index 0000000000..cb2a507bfd --- /dev/null +++ b/package/stress-ng/0002-stress-regs-fix-build-on-riscv32.patch @@ -0,0 +1,43 @@ +From 40309f5d313524f4189f4ef158920391e92e226d Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Thu, 23 Feb 2023 21:38:25 +0100 +Subject: [PATCH] stress-regs: fix build on riscv32 + +RISC-V register test routine is using 64bit registers only. +When compiling on 32bit RISC-V, compilation fails with output: + + stress-regs.c: In function 'stress_regs_helper': + stress-regs.c:485:27: error: register specified for 's1' isn't suitable for data type + 485 | register uint64_t s1 __asm__("s1") = v; + | ^~ + stress-regs.c:495:27: error: register specified for 's11' isn't suitable for data type + 495 | register uint64_t s11 __asm__("s11") = s1 ^ 0xa5a5a5a5a5a5a5a5ULL; + | ^~~ + +This patch fix this issue by protecting the stress_regs_helper() +function with an additional test, to restrict to 64bit. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/6c335ac3abba535e79ddbddf34591ef5b9ee0a96 + +Signed-off-by: Julien Olivain +--- + stress-regs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/stress-regs.c b/stress-regs.c +index 4d4d32d2..0ffac4d1 100644 +--- a/stress-regs.c ++++ b/stress-regs.c +@@ -473,7 +473,7 @@ do { \ + } + #endif + +-#if defined(STRESS_ARCH_RISCV) ++#if defined(STRESS_ARCH_RISCV) && (__riscv_xlen == 64) + + #define STRESS_REGS_HELPER + /* +-- +2.39.2 + diff --git a/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch b/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch new file mode 100644 index 0000000000..beb5429dc1 --- /dev/null +++ b/package/stress-ng/0003-Makefile-introduce-PRESERVE_CFLAGS-build-flag.patch @@ -0,0 +1,78 @@ +From d3ab0bad6afc2e8f4be70fe38dd24788f1b3d4be Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 24 Feb 2023 21:11:30 +0100 +Subject: [PATCH] Makefile: introduce PRESERVE_CFLAGS build flag + +The stress-ng Makefile includes many nice environment auto-detection +features to adjust compilation flags. This is very convenient in +many compilation use-cases. However, in some other specific cross +compilation environments, those automatic CFLAGS adjustments may +create compilation failures. + +For example, commit c00e695ed5 added -fstack-protector-strong if the +compiler recognize the flag. In some situations, for example a gcc +toolchain based on uClibc-ng without stack-protector libssp +enabled, gcc will recognize the option. Then, the Makefile adds the +option to CFLAGS, and the compilation/link fails at link time with an +error like: + + /toolchain/arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp_nonshared: No such file or directory + /toolchain/arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -lssp: No such file or directory + +stress-ng is included in the Buildroot build system [1] [2], which +supports many architectures and toolchain configurations. This build +system carefully controls its CFLAGS. In such a case, it is +preferable for a package to avoid changing compilation flags. + +This patch introduces the PRESERVE_CFLAGS Makefile variable which will +disable those CFLAGS adjustments, if set to 1. The current build +behavior is preserved if unset. + +Upstream-reference: +https://github.com/ColinIanKing/stress-ng/commit/3d87d50561505a5a79008c01e35fc2e100000160 + +[1] https://buildroot.org/ +[2] https://git.buildroot.org/buildroot/tree/package/stress-ng?h=2022.11.1 + +Signed-off-by: Julien Olivain +--- + Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Makefile b/Makefile +index 7a969aba..35151d74 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,6 +45,7 @@ endif + # Test for hardening flags and apply them if applicable + # + MACHINE = $(shell uname -m) ++ifneq ($(PRESERVE_CFLAGS),1) + ifneq ($(MACHINE),$(filter $(MACHINE),alpha parisc)) + ifeq ($(shell $(CC) $(CFLAGS) -fstack-protector-strong -E -xc /dev/null > /dev/null 2>& 1 && echo 1),1) + CFLAGS += -fstack-protector-strong +@@ -58,6 +59,7 @@ ifeq ($(shell $(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -E -xc /dev/null > /dev/null 2 + CFLAGS += -D_FORTIFY_SOURCE=2 + endif + endif ++endif + + # + # Expected build warnings +@@ -83,11 +85,13 @@ PRE_V= + PRE_Q=@# + endif + ++ifneq ($(PRESERVE_CFLAGS),1) + ifeq ($(findstring icc,$(CC)),icc) + CFLAGS += -no-inline-max-size -no-inline-max-total-size + CFLAGS += -axAVX,CORE-AVX2,CORE-AVX-I,CORE-AVX512,SSE2,SSE3,SSSE3,SSE4.1,SSE4.2,SANDYBRIDGE,SKYLAKE,SKYLAKE-AVX512,TIGERLAKE,SAPPHIRERAPIDS + CFLAGS += -ip -falign-loops -funroll-loops -ansi-alias -fma -qoverride-limits + endif ++endif + + #ifeq ($(findstring clang,$(CC)),clang) + #CFLAGS += -Weverything +-- +2.39.2 + diff --git a/package/stress-ng/Config.in b/package/stress-ng/Config.in index 839cbb1cc0..918c3db194 100644 --- a/package/stress-ng/Config.in +++ b/package/stress-ng/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_STRESS_NG bool "stress-ng" depends on BR2_USE_MMU # fork() # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC depends on !BR2_nios2 @@ -16,5 +17,6 @@ config BR2_PACKAGE_STRESS_NG comment "stress-ng needs a toolchain w/ headers >= 3.3" depends on !BR2_nios2 && !BR2_arc + depends on BR2_TOOLCHAIN_HAS_SYNC_4 depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index 2e3f998769..5b967d2b95 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 3de49e1100866634f549e99c1644283d0cde817b844a69dcf7f80afa2227d350 stress-ng-0.13.05.tar.gz +sha256 92922b979b5ca6ee05b03fd792c32a0b25a01fea6161b418b5e672c64ffb549f stress-ng-0.15.04.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 0b2287c7fb..28116b455d 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,11 +4,14 @@ # ################################################################################ -STRESS_NG_VERSION = 0.13.05 +STRESS_NG_VERSION = 0.15.04 STRESS_NG_SITE = $(call github,ColinIanKing,stress-ng,V$(STRESS_NG_VERSION)) STRESS_NG_LICENSE = GPL-2.0+ STRESS_NG_LICENSE_FILES = COPYING +STRESS_NG_MAKE_FLAGS = \ + PRESERVE_CFLAGS=1 + ifeq ($(BR2_PACKAGE_LIBBSD),y) STRESS_NG_DEPENDENCIES += libbsd endif @@ -18,7 +21,7 @@ STRESS_NG_DEPENDENCIES += keyutils endif define STRESS_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(STRESS_NG_MAKE_FLAGS) endef # Don't use make install otherwise stress-ng will be rebuild without From acfe5c70b2301bc147ec524e7bc2d4a95e1cee66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Thu, 23 Feb 2023 09:56:04 +0100 Subject: [PATCH 66/66] package/rt-tests: bump version to 2.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Szymanski Signed-off-by: Thomas Petazzoni --- package/rt-tests/rt-tests.hash | 2 +- package/rt-tests/rt-tests.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index 49df8313f9..eb28f4d441 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 393457f0c91cce57e82b876ecb9b672871f898e6cecafc751548079512bcc808 rt-tests-2.4.tar.xz +sha256 2ed2e4c965c7f336a15d3354dec090e27a0b1e9ada91ae0b9ef18bbcb993874e rt-tests-2.5.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 74290211ce..8ad4215ee1 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,7 +6,7 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.4 +RT_TESTS_VERSION = 2.5 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING