From 65f268e21cbe450e1addb64cca1b9de73c420076 Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Tue, 22 Oct 2024 16:54:54 -0600 Subject: [PATCH 01/20] package/arm-gnu-toolchain: add BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS ARM gnu toolchain for bare metal arm32 target is only available for x86_64 and aarch64 hosts. Introduce a new option to disable packages using this toolchain on unsupported hosts. [Romain: improve commit log] Signed-off-by: Bryce Johnson Signed-off-by: Romain Naour --- package/Config.in.host | 1 + package/arm-gnu-toolchain/Config.in.host | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 package/arm-gnu-toolchain/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 191833d94d92..e06824ad6bd1 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -6,6 +6,7 @@ menu "Host utilities" source "package/amlogic-boot-fip/Config.in.host" source "package/andes-spi-burn/Config.in.host" source "package/android-tools/Config.in.host" + source "package/arm-gnu-toolchain/Config.in.host" source "package/asn1c/Config.in.host" source "package/babeltrace2/Config.in.host" source "package/bmap-tools/Config.in.host" diff --git a/package/arm-gnu-toolchain/Config.in.host b/package/arm-gnu-toolchain/Config.in.host new file mode 100644 index 000000000000..dfd30e5223df --- /dev/null +++ b/package/arm-gnu-toolchain/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS + bool "host arm-gnu-toolchain" + default y if BR2_HOSTARCH = "aarch64" + default y if BR2_HOSTARCH = "x86_64" From b948c2597818595c8b4be15b2d99c65343479e28 Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Tue, 22 Oct 2024 16:54:55 -0600 Subject: [PATCH 02/20] boot/arm-trusted-firmware: use BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS Allow to enable BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN option on aarch64 hosts using HOST_ARM_GNU_TOOLCHAIN_SUPPORTS, in order to build an ATF firmwares that require a pre-built bare metal toolchain (rockpro64_defconfig). [Romain: improve commit log] Signed-off-by: Bryce Johnson Signed-off-by: Romain Naour --- boot/arm-trusted-firmware/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 5ba4e0837016..4a5c7dc89c7b 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -249,7 +249,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN bool "Needs arm-none-eabi toolchain" depends on BR2_aarch64 - depends on BR2_HOSTARCH = "x86_64" + depends on BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS help Select this option if your ATF board configuration requires an ARM32 bare metal toolchain to be available. From f22d4076370a9ac513e17662cc7ce56d5c3ca992 Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Tue, 22 Oct 2024 16:54:56 -0600 Subject: [PATCH 03/20] boot/ti-k3-r5-loader: use BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS ti-k3-r5-loader can only be built on x86_64 or aarch64 hosts due to ARM gnu toolchain dependency. [Romain: improve commit log] Signed-off-by: Bryce Johnson Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c7898ebf697..fe429bb8b4e5 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_ARM_GNU_TOOLCHAIN_SUPPORTS select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman help Separate U-Boot SPL build for R5 core on TI's K3 processors. From 5144d2d7aeafcbff1e0c5bf5ad3fc4bb44ca0089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Wed, 11 Dec 2024 13:40:08 +0100 Subject: [PATCH 04/20] configs/aarch64_efi: bump Linux to 6.11.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump Linux kernel version to 6.11.11 and update the hash accordingly. Signed-off-by: Vincent Stehlé Cc: Dick Olsson Signed-off-by: Romain Naour --- board/aarch64-efi/patches/linux/linux.hash | 2 +- configs/aarch64_efi_defconfig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/aarch64-efi/patches/linux/linux.hash b/board/aarch64-efi/patches/linux/linux.hash index 20941a269b9c..50983eb42bfe 100644 --- a/board/aarch64-efi/patches/linux/linux.hash +++ b/board/aarch64-efi/patches/linux/linux.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 524858852f5869a9ef17de8b1e6e7faf05bcb2c462bc96b3c24dbf82ede373cf linux-6.10.12.tar.xz +sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz diff --git a/configs/aarch64_efi_defconfig b/configs/aarch64_efi_defconfig index 9f284ff74b66..3aa649cf9c36 100644 --- a/configs/aarch64_efi_defconfig +++ b/configs/aarch64_efi_defconfig @@ -1,5 +1,5 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y BR2_GLOBAL_PATCH_DIR="board/aarch64-efi/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/aarch64-efi/post-image.sh support/scripts/ge BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/aarch64-efi/genimage-efi.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.12" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.11" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y From 8ad137d76222f26fd32fdbab0c188ad6b6287d7d Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 9 Dec 2024 00:46:17 +0300 Subject: [PATCH 05/20] {toolchain, linux-headers}: add support for 6.12 headers And add (and default to) 6.12 to linux-headers. Signed-off-by: Sergey Matyukevich Signed-off-by: Romain Naour --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 600247885442..67bdc3237261 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz sha256 d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 linux-6.6.63.tar.xz sha256 aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278 linux-6.1.119.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e8f75158941b..0b517534c714 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_11 + default BR2_KERNEL_HEADERS_6_12 help Select the kernel version to get headers from. @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_11 bool "Linux 6.11.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 + +config BR2_KERNEL_HEADERS_6_12 + bool "Linux 6.12.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -129,8 +133,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_12 + bool "6.12.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11 - bool "6.11.x or later" + bool "6.11.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10 @@ -435,6 +443,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.119" if BR2_KERNEL_HEADERS_6_1 default "6.6.63" if BR2_KERNEL_HEADERS_6_6 default "6.11.11" if BR2_KERNEL_HEADERS_6_11 + default "6.12.3" if BR2_KERNEL_HEADERS_6_12 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index c2522aca7f1f..87160af3d76e 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -660,6 +660,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -673,6 +677,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 default "6.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 default "6.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_10 default "6.9" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_9 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index fcffeb6b77bd..2dc04747b3d2 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -166,8 +166,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_12 + bool "6.12.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_11 - bool "6.11.x or later" + bool "6.11.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_10 From 535dbf2cef0abab30ebc05f0f061f7c4ee0a2ee0 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 9 Dec 2024 00:46:18 +0300 Subject: [PATCH 06/20] linux: bump latest version to 6.12 Signed-off-by: Sergey Matyukevich Signed-off-by: Romain Naour --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 63078d686e8f..f537dd7adf13 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.11)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.12)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -134,7 +134,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.11.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.12.3" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From 6f933e23813678a7eeb2413ebd1a5434c503d1cd Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 9 Dec 2024 00:46:19 +0300 Subject: [PATCH 07/20] package/linux-headers: drop 6.11.x option The 6.11.x series is now EOL upstream, so drop the linux-headers option and add legacy handling for it. Signed-off-by: Sergey Matyukevich Signed-off-by: Romain Naour --- Config.in.legacy | 7 +++++++ linux/linux.hash | 1 - package/linux-headers/Config.in.host | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 05ed773f6524..93d590b50b57 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.02" +config BR2_KERNEL_HEADERS_6_11 + bool "kernel headers version 6.11.x are no longer supported" + select BR2_LEGACY + help + Version 6.11.x of the Linux kernel headers are no longer + maintained upstream and are now removed. + config BR2_PACKAGE_GIBLIB bool "giblib has been removed" select BR2_LEGACY diff --git a/linux/linux.hash b/linux/linux.hash index 67bdc3237261..d37188b4b24b 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 c89809cc777d50f1ea484a118630281a26383707a0e752c96fd834f6e765deae linux-6.12.3.tar.xz -sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz sha256 d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835 linux-6.6.63.tar.xz sha256 aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278 linux-6.1.119.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 0b517534c714..826320c96ea4 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -48,10 +48,6 @@ config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 -config BR2_KERNEL_HEADERS_6_11 - bool "Linux 6.11.x kernel headers" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_11 - config BR2_KERNEL_HEADERS_6_12 bool "Linux 6.12.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 @@ -442,7 +438,6 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.173" if BR2_KERNEL_HEADERS_5_15 default "6.1.119" if BR2_KERNEL_HEADERS_6_1 default "6.6.63" if BR2_KERNEL_HEADERS_6_6 - default "6.11.11" if BR2_KERNEL_HEADERS_6_11 default "6.12.3" if BR2_KERNEL_HEADERS_6_12 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From 2956a3921548921adb5472e092901ff9d9861333 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Nov 2024 13:30:26 +0100 Subject: [PATCH 08/20] package/bc: update _SITE to use BR2_GNU_MIRROR The bc package is distributed on the GNU project servers. See [1] and [2]. Buildroot has the BR2_GNU_MIRROR configuration which can be used for that purpose. See [3] For consistency with all other GNU packages, this commit updates the _SITE to use BR2_GNU_MIRROR. As a side note, the bc package was introduced long time ago using BR2_GNU_MIRROR. See [4]. It was then updated to an alpha version in [5]. When the alpha version was no longer needed, it was switched to the main GNU download server in [6]. [1] https://www.gnu.org/software/bc/ [2] https://www.gnu.org/prep/ftp.html [3] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08.2/Config.in#L286 [4] https://gitlab.com/buildroot.org/buildroot/-/commit/c95dcd464512ede5ffdef5567558611f05e2e52b [5] https://gitlab.com/buildroot.org/buildroot/-/commit/1faa7c344e10986a4afd1d17bf6d4265b3c821fc [6] https://gitlab.com/buildroot.org/buildroot/-/commit/ed7572cc7ff69584116c4e763a608afc225bd0c6 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- package/bc/bc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bc/bc.mk b/package/bc/bc.mk index 06b6feae4fa6..5691ca9e6756 100644 --- a/package/bc/bc.mk +++ b/package/bc/bc.mk @@ -5,7 +5,7 @@ ################################################################################ BC_VERSION = 1.07.1 -BC_SITE = http://ftp.gnu.org/gnu/bc +BC_SITE = $(BR2_GNU_MIRROR)/bc BC_DEPENDENCIES = host-flex BC_LICENSE = GPL-2.0+, LGPL-2.1+ BC_LICENSE_FILES = COPYING COPYING.LIB From 51858c4a34f73c52ac9ff36ba7facf8a8ab9b711 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Nov 2024 14:13:42 +0100 Subject: [PATCH 09/20] boot/grub2: update _SITE to use BR2_GNU_MIRROR The grub2 package is distributed on the GNU project servers. See [1] and [2]. Buildroot has the BR2_GNU_MIRROR configuration which can be used for that purpose. See [3]. For consistency with all other GNU packages, this commit updates the _SITE to use BR2_GNU_MIRROR. Note: Commit [4] introduced the grub2 package using BR2_GNU_MIRROR. Commit [5] changed it to use "http://ftp.gnu.org/gnu/grub" without providing a justification for that change. [1] https://www.gnu.org/software/grub/grub-download.html [2] https://www.gnu.org/prep/ftp.html [3] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08.2/Config.in#L286 [4] https://gitlab.com/buildroot.org/buildroot/-/commit/c24fdb3680019d18f0cb7c02a90975ee9fe9613c [5] https://gitlab.com/buildroot.org/buildroot/-/commit/5ffafd2353f5d67dc74c7f3784dfe48d4080435e Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- boot/grub2/grub2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 4df12774a38d..089602932281 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -5,7 +5,7 @@ ################################################################################ GRUB2_VERSION = 2.12 -GRUB2_SITE = http://ftp.gnu.org/gnu/grub +GRUB2_SITE = $(BR2_GNU_MIRROR)/grub GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz GRUB2_LICENSE = GPL-3.0+ GRUB2_LICENSE_FILES = COPYING From 7cc2d8b183fdd3fd52454d916ea8eac6f1136925 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Fri, 6 Dec 2024 11:04:17 +0800 Subject: [PATCH 10/20] configs/cubieboard2: bump Linux to 6.11.11 and U-Boot to 2024.10 The boot.vfat image size is not enough now. The new zImage file is over 10M, so it is expanded to 16M. This commit also adds the custom version package hashes, and the corresponding ".checkpackageignore" entry is also removed. Signed-off-by: Scott Fan Signed-off-by: Romain Naour --- .checkpackageignore | 1 - board/cubietech/cubieboard2/genimage.cfg | 2 +- .../patches/linux-headers/linux-headers.hash | 1 + board/cubietech/cubieboard2/patches/linux/linux.hash | 2 ++ board/cubietech/cubieboard2/patches/uboot/uboot.hash | 2 ++ configs/cubieboard2_defconfig | 10 ++++++---- 6 files changed, 12 insertions(+), 6 deletions(-) create mode 120000 board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash create mode 100644 board/cubietech/cubieboard2/patches/linux/linux.hash create mode 100644 board/cubietech/cubieboard2/patches/uboot/uboot.hash diff --git a/.checkpackageignore b/.checkpackageignore index 2b63d235f358..42efd60b5090 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -137,7 +137,6 @@ configs/beelink_gs1_defconfig lib_defconfig.ForceCheckHash configs/broadcom_northstar_defconfig lib_defconfig.ForceCheckHash configs/canaan_kd233_defconfig lib_defconfig.ForceCheckHash configs/ci20_defconfig lib_defconfig.ForceCheckHash -configs/cubieboard2_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6qdl_icore_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6qdl_icore_qt5_defconfig lib_defconfig.ForceCheckHash configs/engicam_imx6qdl_icore_rqs_defconfig lib_defconfig.ForceCheckHash diff --git a/board/cubietech/cubieboard2/genimage.cfg b/board/cubietech/cubieboard2/genimage.cfg index 0ba74d6be36c..f8a8ec05c885 100644 --- a/board/cubietech/cubieboard2/genimage.cfg +++ b/board/cubietech/cubieboard2/genimage.cfg @@ -10,7 +10,7 @@ image boot.vfat { } } - size = 10M + size = 16M } image sdcard.img { diff --git a/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash b/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash new file mode 120000 index 000000000000..5808d92afe89 --- /dev/null +++ b/board/cubietech/cubieboard2/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/cubietech/cubieboard2/patches/linux/linux.hash b/board/cubietech/cubieboard2/patches/linux/linux.hash new file mode 100644 index 000000000000..4759f8354e1e --- /dev/null +++ b/board/cubietech/cubieboard2/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz diff --git a/board/cubietech/cubieboard2/patches/uboot/uboot.hash b/board/cubietech/cubieboard2/patches/uboot/uboot.hash new file mode 100644 index 000000000000..904fa56c02a3 --- /dev/null +++ b/board/cubietech/cubieboard2/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 14d080d2d411..42344eaf9ef2 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -1,23 +1,25 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y +BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard2/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-cubieboard2" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From 4f6a924fa8e1a1b5d94acd5529eeb7feb9af94e5 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Fri, 6 Dec 2024 11:04:18 +0800 Subject: [PATCH 11/20] configs/cubieboard2: switch to use extlinux.conf Switch to extlinux instead of U-Boot boot script. Remove obsolete entry from the .checkpackageignore file. Drop custom boot script and genimage config. Drop unnecessary generic and host configs. Signed-off-by: Scott Fan Signed-off-by: Romain Naour --- .checkpackageignore | 1 - board/cubietech/cubieboard2/boot.cmd | 5 ----- board/cubietech/cubieboard2/genimage.cfg | 22 ------------------- board/cubietech/cubieboard2/post-image.sh | 16 -------------- .../boot/extlinux/extlinux.conf | 4 ++++ configs/cubieboard2_defconfig | 13 ++++------- 6 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 board/cubietech/cubieboard2/boot.cmd delete mode 100755 board/cubietech/cubieboard2/post-image.sh create mode 100644 board/cubietech/cubieboard2/rootfs_overlay/boot/extlinux/extlinux.conf diff --git a/.checkpackageignore b/.checkpackageignore index 42efd60b5090..f24859bf4942 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -25,7 +25,6 @@ board/chromebook/elm/sign.sh Shellcheck board/chromebook/mksd.sh Shellcheck board/chromebook/snow/sign.sh Shellcheck board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch lib_patch.Upstream -board/cubietech/cubieboard2/post-image.sh Shellcheck board/freescale/common/imx/imx8-bootloader-prepare.sh Shellcheck board/freescale/common/mxs/post-image.sh Shellcheck board/friendlyarm/nanopi-r2s/post-build.sh Shellcheck diff --git a/board/cubietech/cubieboard2/boot.cmd b/board/cubietech/cubieboard2/boot.cmd deleted file mode 100644 index a9ae0e24e6ee..000000000000 --- a/board/cubietech/cubieboard2/boot.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv fdt_high ffffffff -setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait -fatload mmc 0 $kernel_addr_r zImage -fatload mmc 0 $fdt_addr_r sun7i-a20-cubieboard2.dtb -bootz $kernel_addr_r - $fdt_addr_r diff --git a/board/cubietech/cubieboard2/genimage.cfg b/board/cubietech/cubieboard2/genimage.cfg index f8a8ec05c885..92c867754568 100644 --- a/board/cubietech/cubieboard2/genimage.cfg +++ b/board/cubietech/cubieboard2/genimage.cfg @@ -1,18 +1,3 @@ -# Minimal SD card image for the Cubieboard2 -# Based in the Orange Pi genimage.cfg - -image boot.vfat { - vfat { - files = { - "zImage", - "sun7i-a20-cubieboard2.dtb", - "boot.scr" - } - } - - size = 16M -} - image sdcard.img { hdimage { } @@ -24,15 +9,8 @@ image sdcard.img { size = 1016K # 1MB - 8KB } - partition boot { - partition-type = 0xC - bootable = "true" - image = "boot.vfat" - } - partition rootfs { partition-type = 0x83 image = "rootfs.ext4" - size = 512M } } diff --git a/board/cubietech/cubieboard2/post-image.sh b/board/cubietech/cubieboard2/post-image.sh deleted file mode 100755 index 9cca1b1789ec..000000000000 --- a/board/cubietech/cubieboard2/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/board/cubietech/cubieboard2/rootfs_overlay/boot/extlinux/extlinux.conf b/board/cubietech/cubieboard2/rootfs_overlay/boot/extlinux/extlinux.conf new file mode 100644 index 000000000000..14c873e1673e --- /dev/null +++ b/board/cubietech/cubieboard2/rootfs_overlay/boot/extlinux/extlinux.conf @@ -0,0 +1,4 @@ +label cubieboard-buildroot + kernel /boot/zImage + devicetree /boot/sun7i-a20-cubieboard2.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait diff --git a/configs/cubieboard2_defconfig b/configs/cubieboard2_defconfig index 42344eaf9ef2..9c0e51b37dc4 100644 --- a/configs/cubieboard2_defconfig +++ b/configs/cubieboard2_defconfig @@ -4,16 +4,16 @@ BR2_ARM_FPU_NEON_VFPV4=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_11=y BR2_GLOBAL_PATCH_DIR="board/cubietech/cubieboard2/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2" -BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!" -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh" +BR2_ROOTFS_OVERLAY="board/cubietech/cubieboard2/rootfs_overlay" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.11" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun7i-a20-cubieboard2" +BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y @@ -26,9 +26,4 @@ BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd" From dcb4d360eceb3c6f66dbee54759326ec7541b632 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Fri, 6 Dec 2024 11:06:15 +0800 Subject: [PATCH 12/20] board/cubietech/cubieboard1: use lowercase keywords in extlinux.conf file This commit also updates the label name, and the unnecessary "default" entry is also removed. Signed-off-by: Scott Fan Signed-off-by: Romain Naour --- .../rootfs_overlay/boot/extlinux/extlinux.conf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf b/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf index 2fde683f3807..5b071dce8401 100644 --- a/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf +++ b/board/cubietech/cubieboard1/rootfs_overlay/boot/extlinux/extlinux.conf @@ -1,5 +1,4 @@ -DEFAULT linux -LABEL linux - KERNEL /boot/zImage - DEVICETREE /boot/sun4i-a10-cubieboard.dtb - APPEND console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait +label cubieboard-buildroot + kernel /boot/zImage + devicetree /boot/sun4i-a10-cubieboard.dtb + append console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rootwait From 722cba476f994339e37d022081c38977fcf3fe5d Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Fri, 6 Dec 2024 11:06:16 +0800 Subject: [PATCH 13/20] configs/cubieboard1: bump Linux version to 6.11.11 Signed-off-by: Scott Fan Signed-off-by: Romain Naour --- board/cubietech/cubieboard1/patches/linux/linux.hash | 2 +- configs/cubieboard1_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/cubietech/cubieboard1/patches/linux/linux.hash b/board/cubietech/cubieboard1/patches/linux/linux.hash index 42d02c9f7836..4759f8354e1e 100644 --- a/board/cubietech/cubieboard1/patches/linux/linux.hash +++ b/board/cubietech/cubieboard1/patches/linux/linux.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c954f60197008f1e1f32a1e77293903cf3801d2543ec4bf521f5651eb7f133ce linux-6.11.6.tar.xz +sha256 62148e7e17f54c4a5ab5e75ad4882682c54bee818948be61a5963234fc0849fc linux-6.11.11.tar.xz diff --git a/configs/cubieboard1_defconfig b/configs/cubieboard1_defconfig index c3dede47b8ef..6d189bcf9527 100644 --- a/configs/cubieboard1_defconfig +++ b/configs/cubieboard1_defconfig @@ -8,7 +8,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/cubietech/cubieboard1/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.11.11" BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun4i-a10-cubieboard" From 36c7a5366a975519aba6cbc2f0306c8547a31d5f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 16 Nov 2024 17:35:37 +0100 Subject: [PATCH 14/20] support/testing/tests/boot/test_edk2.py: switch to neoverse-n1 cpu The SBSA Reference Platform was updated to use the neoverse-n1 cpu (armv8.2a) in Qemu v8.1 [1]. Commit c58a2a968 "configs/qemu_aarch64_sbsa_defconfig: switch to neoverse-n1 (armv8.2a)" [2] reflected this change in qemu_aarch64_sbsa_defconfig. This commit updates the test_edk2 runtime test the same way. This update is possible with the help of commits [3] and [4]. [1] https://gitlab.com/qemu-project/qemu/-/commit/1877272bad7b08b67312503ee66184279876c7bd [2] https://gitlab.com/buildroot.org/buildroot/-/commit/c58a2a9687c045379c0f768c8c6c1c1a41842a85 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/0d4177598ce7e73f2b97ac58c21fb177343643e3 [4] https://gitlab.com/buildroot.org/buildroot/-/commit/fba62f2ab13c095de860a07851d148181f4e38bc Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- support/testing/tests/boot/test_edk2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/boot/test_edk2.py b/support/testing/tests/boot/test_edk2.py index 39d7a4dbcc29..54a59089dada 100644 --- a/support/testing/tests/boot/test_edk2.py +++ b/support/testing/tests/boot/test_edk2.py @@ -7,6 +7,7 @@ class TestEdk2(infra.basetest.BRTest): config = \ """ BR2_aarch64=y + BR2_neoverse_n1=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y @@ -63,7 +64,7 @@ def test_run(self): flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") self.emulator.boot(arch="aarch64", options=["-M", "sbsa-ref", - "-cpu", "cortex-a57", + "-cpu", "neoverse-n1", "-m", "512M", "-pflash", flash0, "-pflash", flash1, From c2f91e90468ee942f68440a20153f8668012eea6 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 16 Nov 2024 17:47:27 +0100 Subject: [PATCH 15/20] support/testing/tests/package/test_fwts.py: switch to neoverse-n1 cpu The SBSA Reference Platform was updated to use the neoverse-n1 cpu (armv8.2a) in Qemu v8.1 [1]. Commit c58a2a968 "configs/qemu_aarch64_sbsa_defconfig: switch to neoverse-n1 (armv8.2a)" [2] reflected this change in qemu_aarch64_sbsa_defconfig. This commit updates the test_fwts runtime test the same way. This update is possible with the help of commits [3] and [4]. [1] https://gitlab.com/qemu-project/qemu/-/commit/1877272bad7b08b67312503ee66184279876c7bd [2] https://gitlab.com/buildroot.org/buildroot/-/commit/c58a2a9687c045379c0f768c8c6c1c1a41842a85 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/0d4177598ce7e73f2b97ac58c21fb177343643e3 [4] https://gitlab.com/buildroot.org/buildroot/-/commit/027ddcbff65bb9dc1799d89fc140a33e81d35421 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- support/testing/tests/package/test_fwts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_fwts.py b/support/testing/tests/package/test_fwts.py index 6e2b6f50ba83..4df13b60f9e0 100644 --- a/support/testing/tests/package/test_fwts.py +++ b/support/testing/tests/package/test_fwts.py @@ -7,6 +7,7 @@ class TestFwts(infra.basetest.BRTest): config = \ """ BR2_aarch64=y + BR2_neoverse_n1=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_TARGET_ROOTFS_EXT2=y @@ -66,7 +67,7 @@ def test_run(self): flash1 = os.path.join(self.builddir, "images", "SBSA_FLASH1.fd") self.emulator.boot(arch="aarch64", options=["-M", "sbsa-ref", - "-cpu", "cortex-a57", + "-cpu", "neoverse-n1", "-m", "512M", "-pflash", flash0, "-pflash", flash1, From 0f9da3934b9fc1425db49526ab7735a601ac1edb Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 15 Nov 2024 23:02:15 +0100 Subject: [PATCH 16/20] Config.in: switch GNU mirrors URL to https As explained on [1], the primary GNU mirrors URL is https. This commit updates BR2_GNU_MIRROR to switch to it. [1] https://www.gnu.org/prep/ftp.html Signed-off-by: Julien Olivain Reviewed-by: Vincent Jardin Signed-off-by: Romain Naour --- Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.in b/Config.in index d7a8dc68485c..247a9e8ef1cb 100644 --- a/Config.in +++ b/Config.in @@ -285,7 +285,7 @@ config BR2_KERNEL_MIRROR config BR2_GNU_MIRROR string "GNU Software mirror" - default "http://ftpmirror.gnu.org" + default "https://ftpmirror.gnu.org" help GNU has multiple software mirrors scattered around the world. The following allows you to select your preferred From b0a1b0bab1238271ca99d6a453101d6b128b027a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Nov 2024 13:38:39 +0100 Subject: [PATCH 17/20] package/octave: update _SITE to use BR2_GNU_MIRROR The octave package is distributed on the GNU project servers. See [1] and [2]. Buildroot has the BR2_GNU_MIRROR configuration which can be used for that purpose. See [3]. For consistency with all other GNU packages, this commit updates the _SITE to use BR2_GNU_MIRROR. [1] https://www.octave.org/download [2] https://www.gnu.org/prep/ftp.html [3] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08.2/Config.in#L286 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- package/octave/octave.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 2e2fe0f989e4..34d9288c7571 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -5,7 +5,7 @@ ################################################################################ OCTAVE_VERSION = 9.2.0 -OCTAVE_SITE = https://ftp.gnu.org/gnu/octave +OCTAVE_SITE = $(BR2_GNU_MIRROR)/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ OCTAVE_LICENSE_FILES = COPYING From bfa2dbc2d679b88d8166359ec916590050fb5802 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Nov 2024 13:45:04 +0100 Subject: [PATCH 18/20] package/freeipmi: update _SITE to use BR2_GNU_MIRROR The freeipmi package is distributed on the GNU project servers. See [1] and [2]. Buildroot has the BR2_GNU_MIRROR configuration which can be used for that purpose. See [3]. For consistency with all other GNU packages, this commit updates the _SITE to use BR2_GNU_MIRROR. [1] https://www.gnu.org/software/freeipmi/download.html [2] https://www.gnu.org/prep/ftp.html [3] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08.2/Config.in#L286 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- package/freeipmi/freeipmi.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index e28f63f71548..fbbfd536e465 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -5,7 +5,7 @@ ################################################################################ FREEIPMI_VERSION = 1.6.14 -FREEIPMI_SITE = https://ftp.gnu.org/gnu/freeipmi +FREEIPMI_SITE = $(BR2_GNU_MIRROR)/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \ COPYING COPYING.bmc-watchdog COPYING.ipmiconsole COPYING.ipmi-dcmi \ From 9ccc0f5642cf173bcc8d51f778331acfea9dbde8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 17 Nov 2024 13:54:49 +0100 Subject: [PATCH 19/20] package/nettle: update _SITE to use BR2_GNU_MIRROR The nettle package is distributed on the GNU project servers. See [1] and [2]. Buildroot has the BR2_GNU_MIRROR configuration which can be used for that purpose. See [3]. For consistency with all other GNU packages, this commit updates the _SITE to use BR2_GNU_MIRROR. Note: the nettle _SITE was updated to ftp.gnu.org in commit [4]. [1] https://www.lysator.liu.se/~nisse/nettle/ [2] https://www.gnu.org/prep/ftp.html [3] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.08.2/Config.in#L286 [4] https://gitlab.com/buildroot.org/buildroot/-/commit/92f0ef5eaa74af28b2b7b7abbe021bce2aba4875 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- package/nettle/nettle.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk index 22a41ba55b82..3f30fd761d75 100644 --- a/package/nettle/nettle.mk +++ b/package/nettle/nettle.mk @@ -5,7 +5,7 @@ ################################################################################ NETTLE_VERSION = 3.10 -NETTLE_SITE = https://ftp.gnu.org/gnu/nettle +NETTLE_SITE = $(BR2_GNU_MIRROR)/nettle NETTLE_DEPENDENCIES = host-m4 gmp NETTLE_INSTALL_STAGING = YES NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+ From ed9da089449c53519be02204f97c3452abba5cc3 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 5 Nov 2024 21:20:39 +0100 Subject: [PATCH 20/20] support/testing/infra/emulator.py: add qemu version in run log In some specific situations, there is subtle bugs which depends on a specific Qemu emulator version and the code it runs. For example, EDK2 on Aarch64 could work with specific versions of Qemu, EDK2 and ATF. See commit cc0823c2d "boot/edk2: bump to version edk2-stable202405" [1]. Also, some Qemu bugs made the guest OS crash. See for example commit 9534b9c00 "package/qemu: fix qemu 9.x issue for AArch32 Secure PL1&0" [2]. Commit 0d4177598 "support/testing/infra/emulator.py: add build host dir to qemu search path" added the ability for a runtime test to select host-qemu in order to use it. It is also possible for a user to use the "utils/run-tests" script on its host system providing its own version of Qemu. The Buildroot CI can also use its Qemu version included in the reference Docker image. This means the Qemu emulator for running a runtime test can be from several sources: - Buildroot Docker reference image, - Buildroot host-qemu package version, - Developer host OS qemu version. Those versions can also change in time. In order to help debugging of those subtle emulator bugs, this commit adds a recording of the actual Qemu version used to run a test. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/cc0823c2d14321b91b94801834050331f5ea28e1 [2] https://gitlab.com/buildroot.org/buildroot/-/commit/9534b9c00c23cfd69a4e122c26fca9d3da93d329 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/0d4177598ce7e73f2b97ac58c21fb177343643e3 Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- support/testing/infra/emulator.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 238e123302f0..ef5be2a19e72 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -116,15 +116,21 @@ def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): ldavg_str = f"{ldavg[0]:.2f}, {ldavg[1]:.2f}, {ldavg[2]:.2f}" self.logfile.write(f"> host loadavg: {ldavg_str}\n") self.logfile.write(f"> timeout multiplier: {self.timeout_multiplier}\n") - self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) + self.logfile.write(f"> emulator using {qemu_cmd[0]} version:\n") host_bin = os.path.join(self.builddir, "host", "bin") br_path = host_bin + os.pathsep + os.environ["PATH"] + qemu_env = {"QEMU_AUDIO_DRV": "none", + "PATH": br_path} + pexpect.run(f"{qemu_cmd[0]} --version", + encoding='utf-8', + logfile=self.logfile, + env=qemu_env) + self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, encoding='utf-8', codec_errors='replace', - env={"QEMU_AUDIO_DRV": "none", - "PATH": br_path}) + env=qemu_env) # We want only stdout into the log to avoid double echo self.qemu.logfile_read = self.logfile