From b329eb2172c5622dfbb45026dfb2384a5c12a233 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 07:43:50 +0100 Subject: [PATCH 01/49] package/bootgen: bump to xilinx_v2024.1 Bump bootgen to xilinx_v2024.1. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- package/bootgen/bootgen.hash | 2 +- package/bootgen/bootgen.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bootgen/bootgen.hash b/package/bootgen/bootgen.hash index 6f34b2b850..506aae8a84 100644 --- a/package/bootgen/bootgen.hash +++ b/package/bootgen/bootgen.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 aa8120369d8a6016c731a3338188045c82833602e8ea955b53130a16560e5eb3 bootgen-xilinx_v2023.2.tar.gz +sha256 7879c7d40642bcf7adcec177a51cf73f95bd45d315f75d125d3fc1680c0a9b24 bootgen-xilinx_v2024.1.tar.gz sha256 4da5f5eff0592e5d275f1871faf9e9a4fc0f6346027bfb777fa59d0aa6a59aa3 LICENSE diff --git a/package/bootgen/bootgen.mk b/package/bootgen/bootgen.mk index 70338090f4..912e2e31b3 100644 --- a/package/bootgen/bootgen.mk +++ b/package/bootgen/bootgen.mk @@ -4,7 +4,7 @@ # ################################################################################ -BOOTGEN_VERSION = xilinx_v2023.2 +BOOTGEN_VERSION = xilinx_v2024.1 BOOTGEN_SITE = $(call github,Xilinx,bootgen,$(BOOTGEN_VERSION)) HOST_BOOTGEN_DEPENDENCIES = host-openssl host-pkgconf BOOTGEN_LICENSE = Apache-2.0 From 8d5a3d1af54a85f4796ae73a61169e08098faf39 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:46 +0100 Subject: [PATCH 02/49] board/zynq/patches: add xilinx_2024.1 hashes Add the Linux and u-boot hashes for xilinx_2024.1 release. xilinx_2024.1 release includes: - uboot 2024.01 - linux 6.6.10 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- board/zynq/patches/linux/linux.hash | 1 + board/zynq/patches/uboot/uboot.hash | 1 + 2 files changed, 2 insertions(+) diff --git a/board/zynq/patches/linux/linux.hash b/board/zynq/patches/linux/linux.hash index 8ed4bbead4..db57012f98 100644 --- a/board/zynq/patches/linux/linux.hash +++ b/board/zynq/patches/linux/linux.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 56acddefc6f6fdc00df5b75ceb4f86a9d0af9a4fef78cf57f9f2c274b22f006f xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz +sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz diff --git a/board/zynq/patches/uboot/uboot.hash b/board/zynq/patches/uboot/uboot.hash index 35e54e0baf..516707bf26 100644 --- a/board/zynq/patches/uboot/uboot.hash +++ b/board/zynq/patches/uboot/uboot.hash @@ -1,2 +1,3 @@ # Locally calculated sha256 32a997a748697ff27e5e6db8edaff5ba893077214bc18b5267daff0b708dab53 xlnx_rebase_v2023.01_2023.2.tar.gz +sha256 58e391a001d9d8ed347ab3258ff7c8435c866b1ff2b2c22ebc95af592444c0f5 xlnx_rebase_v2024.01_2024.1.tar.gz From eefc510767c3d9ea7f7c89642e34b8cdb6174195 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:47 +0100 Subject: [PATCH 03/49] board/zynq/post-image.sh: support linux 6.6 dts directory structure Linux 6.6 includes a xilinx directory in the dts directory structure for zynq boards. This patch updates the post-image.sh to match the zynqmp post-image.sh in order to support this change. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- board/zynq/post-image.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh index 192354b5be..f44b66342d 100755 --- a/board/zynq/post-image.sh +++ b/board/zynq/post-image.sh @@ -4,9 +4,9 @@ # let's use a symlink with that name that points to the *first* # devicetree listed in the config. -FIRST_DT=$(sed -n \ - 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ - "${BR2_CONFIG}") +FIRST_DT=$(sed -nr \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ + "${BR2_CONFIG}") [ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" From a13aca12af814b789884ae84360b2397da9c84ca Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 31 May 2024 13:57:25 +0200 Subject: [PATCH 04/49] board/zynq: make post-image.sh a symlink to board/zynqmp/post-image.sh The zynq/zynqmp post-image scripts are now identical, so replace the zynq copy with a symlink to limit redundancy. Signed-off-by: Peter Korsgaard --- board/zynq/post-image.sh | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) mode change 100755 => 120000 board/zynq/post-image.sh diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh deleted file mode 100755 index f44b66342d..0000000000 --- a/board/zynq/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# By default U-Boot loads DTB from a file named "system.dtb", so -# let's use a symlink with that name that points to the *first* -# devicetree listed in the config. - -FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ - "${BR2_CONFIG}") - -[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" - -BOARD_DIR="$(dirname "$0")" - -support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh new file mode 120000 index 0000000000..775184415d --- /dev/null +++ b/board/zynq/post-image.sh @@ -0,0 +1 @@ +../zynqmp/post-image.sh \ No newline at end of file From 2770ab249cae186511b134dcc6196f8fa47163b6 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:48 +0100 Subject: [PATCH 05/49] configs/zynq_zc702_defconfig: bump to xilinx-v2024.1 This patch bumps the zynq_zc702_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_zc702_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 84c8843ced..9e37678d9b 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/zynq/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zc702" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zc702" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc702" BR2_TARGET_UBOOT_NEEDS_DTC=y From 3e0cedb2ab072ba4cf5b39b64448e93e3e36c894 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:49 +0100 Subject: [PATCH 06/49] configs/zynq_zc706_defconfig: bump to xilinx-v2024.1 This patch bumps the zynq_zc706_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_zc706_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index e22ba7a3d9..9ccf23f6e1 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/zynq/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zc706" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zc706" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706" BR2_TARGET_UBOOT_NEEDS_DTC=y From f555bffb8ed3e699f94fbfc88255bc0bca937e0d Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:50 +0100 Subject: [PATCH 07/49] configs/zynq_zed_defconfig: bump to xilinx-v2024.1 This patch bumps the zynq_zed_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_zed_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 33e7aa02e0..95606caf5c 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/zynq/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zed" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-zed" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed" BR2_TARGET_UBOOT_NEEDS_DTC=y From 622d3b25307bdc6db74628515be7f7b244f4bf77 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:51 +0100 Subject: [PATCH 08/49] configs/zynq_microzed_defconfig: bump to xilinx-v2024.1 This patch bumps the zynq_microzed_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- configs/zynq_microzed_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 8fb9bc49dc..c6ca5a6244 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -2,26 +2,26 @@ BR2_arm=y BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/zynq/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-microzed" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynq-microzed" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynq_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed" BR2_TARGET_UBOOT_NEEDS_DTC=y From b574b0b9e6d076e25a3d67e8f4bddcd690ef2b1f Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 31 May 2024 10:47:52 +0100 Subject: [PATCH 09/49] board/zynq/patches: remove xilinx 6.1.70 hashes Now that the zynq_* defconfigs have migrated to xilinx_2024.1, remove the older hashes. Signed-off-by: Neal Frager Signed-off-by: Peter Korsgaard --- board/zynq/patches/linux/linux.hash | 1 - board/zynq/patches/uboot/uboot.hash | 1 - 2 files changed, 2 deletions(-) diff --git a/board/zynq/patches/linux/linux.hash b/board/zynq/patches/linux/linux.hash index db57012f98..d85f773478 100644 --- a/board/zynq/patches/linux/linux.hash +++ b/board/zynq/patches/linux/linux.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 56acddefc6f6fdc00df5b75ceb4f86a9d0af9a4fef78cf57f9f2c274b22f006f xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz sha256 ea85988e66b9a2e19ccd76d0f5f5e657988a873fed292160917712f45605a805 xlnx_rebase_v6.6_LTS_2024.1.tar.gz diff --git a/board/zynq/patches/uboot/uboot.hash b/board/zynq/patches/uboot/uboot.hash index 516707bf26..a5ab9fae05 100644 --- a/board/zynq/patches/uboot/uboot.hash +++ b/board/zynq/patches/uboot/uboot.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 32a997a748697ff27e5e6db8edaff5ba893077214bc18b5267daff0b708dab53 xlnx_rebase_v2023.01_2023.2.tar.gz sha256 58e391a001d9d8ed347ab3258ff7c8435c866b1ff2b2c22ebc95af592444c0f5 xlnx_rebase_v2024.01_2024.1.tar.gz From 9a629f5129d652960b203e53685aea24a4dd86a1 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Fri, 31 May 2024 12:44:25 +0200 Subject: [PATCH 10/49] utils/docker-run: allow running with Podman Podman is command line compatible with Docker, there's no need to require contributors to install Docker to run checks before sending patches. The additional "--userns=keep-id" option is necessary because unlike Docker Podman creates a user namespace for containers by default. Without keep-id the repository and pre-existing output files belong to root inside the container namespace, breaking writes, certain Git safety checks, and possibly all access (if the user is using a strict umask). Signed-off-by: Fiona Klute Signed-off-by: Yann E. MORIN --- utils/docker-run | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 79694474c1..3dcabe2718 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -29,6 +29,16 @@ declare -a mountpoints=( "$(pwd)" ) +if command -v docker >/dev/null; then + DOCKER="docker" +elif command -v podman >/dev/null; then + DOCKER="podman" + docker_opts+=( --userns=keep-id ) +else + echo "ERROR: Neither docker nor podman available!" >&2 + exit 1 +fi + # curl lists (and recognises and uses) other types of *_proxy variables, # but only those make sense for Buildroot: for env in all_proxy http_proxy https_proxy ftp_proxy no_proxy; do @@ -84,4 +94,4 @@ if tty -s; then docker_opts+=( -t ) fi -exec docker run "${docker_opts[@]}" "${IMAGE}" "${@}" +exec ${DOCKER} run "${docker_opts[@]}" "${IMAGE}" "${@}" From f99862d63499619cf7e22e50b5331371bb5fc7c0 Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Fri, 31 May 2024 13:05:19 +0300 Subject: [PATCH 11/49] package/tbtools: bump to version 0.4.0 Update against the latest release of tbtools. Signed-off-by: Mika Westerberg Signed-off-by: Yann E. MORIN --- package/tbtools/tbtools.hash | 2 +- package/tbtools/tbtools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tbtools/tbtools.hash b/package/tbtools/tbtools.hash index ebd838ebe1..06705fc19d 100644 --- a/package/tbtools/tbtools.hash +++ b/package/tbtools/tbtools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e5ddbcb3dcf6315a1fe6fe2d4846b5208e75f24e626d43a0ea68358e8b15dba7 tbtools-0.3.2-cargo2.tar.gz +sha256 1276ded79276d42c06a16293e26de32566c023383416fb8c91f86d141acce691 tbtools-0.4.0-cargo2.tar.gz sha256 9b16a3add311d607af8d9b348a842a37840d0f47dfcc6cf2a7756ee02c24ed69 LICENSE diff --git a/package/tbtools/tbtools.mk b/package/tbtools/tbtools.mk index 36bfcd7f49..fc5ffc4215 100644 --- a/package/tbtools/tbtools.mk +++ b/package/tbtools/tbtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -TBTOOLS_VERSION = 0.3.2 +TBTOOLS_VERSION = 0.4.0 TBTOOLS_SITE = $(call github,intel,tbtools,v$(TBTOOLS_VERSION)) TBTOOLS_LICENSE = MIT TBTOOLS_LICENSE_FILES = LICENSE From 5b54a92563b536acd34f6ea54fd1161a257e2365 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 30 May 2024 22:34:53 +0200 Subject: [PATCH 12/49] package/swupdate: bump to version 2024.05 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/swupdate/swupdate.hash | 2 +- package/swupdate/swupdate.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/swupdate/swupdate.hash b/package/swupdate/swupdate.hash index 19ef3a2724..13964351f6 100644 --- a/package/swupdate/swupdate.hash +++ b/package/swupdate/swupdate.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 89ec8926d66627255fe689ed96ad8d30f5c539315956dacf9890e308095dee3b swupdate-2023.12.1.tar.gz +sha256 c8af1e964d0123a7d4bbba981170eff723db87dcd37e5881c584ffee54194d1a swupdate-2024.05.tar.gz sha256 4cf04ed34ff0ebbf5c71345b56e6af5093fc17206364cca0ebbae92ef3940683 LICENSES/BSD-1-Clause.txt sha256 e27a3e87706b3aa5ff2e50eaafe2e6ed5397fbf2d7679eaf444a6d000518a3a6 LICENSES/BSD-3-Clause.txt sha256 0558101984550fa84d1d13c2af11d116c20079d2be58711e8d99cadce7009192 LICENSES/CC0-1.0.txt diff --git a/package/swupdate/swupdate.mk b/package/swupdate/swupdate.mk index 467e4f22ea..b36aabb1e7 100644 --- a/package/swupdate/swupdate.mk +++ b/package/swupdate/swupdate.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWUPDATE_VERSION = 2023.12.1 +SWUPDATE_VERSION = 2024.05 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) SWUPDATE_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+, MIT, ISC, BSD-1-Clause, BSD-3-Clause, CC0-1.0, CC-BY-SA-4.0, OFL-1.1 SWUPDATE_LICENSE_FILES = LICENSES/BSD-1-Clause.txt \ From 82efc2faa923e8881748738963be1fbe3cb2bb45 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Mon, 27 May 2024 14:45:05 +0100 Subject: [PATCH 13/49] package/libcamera: bump to version 0.3.0 Signed-off-by: Kieran Bingham Signed-off-by: Peter Korsgaard --- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 1ae74b3b18..1566356b99 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 f9c3e949f9d6a42e29322833e57a0e6e8c54655507c820636470ea597e767fd8 libcamera-v0.2.0-git4.tar.gz +sha256 1e0a3feff93577a30bcd4e67aa4c1969aecabcd90f78f540a637bb77553c5a7d libcamera-v0.3.0-git4.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index eecbaa44b9..dfcd340b75 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.2.0 +LIBCAMERA_VERSION = v0.3.0 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ From e7f25b2b40e2beeac2f7fbe70fbb91cc892ed1ae Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 May 2024 21:06:07 +0200 Subject: [PATCH 14/49] package/mongoose: bump to version 7.14 https://github.com/cesanta/mongoose/releases/tag/7.14 Signed-off-by: Giulio Benetti [Peter: fix missing newline in .hash file] Signed-off-by: Peter Korsgaard --- package/mongoose/mongoose.hash | 4 ++-- package/mongoose/mongoose.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index 716833eeed..8874ba4171 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5c9dc8d1d1762ef483b6d2fbf5234e421ca944b722225bb533d2d0507b118a0f mongoose-7.13.tar.gz -sha256 4ba646f5a7012d8b52f3a74398e446f56960dde0572f7241a2215430da5dd5a2 LICENSE +sha256 7c4aecf92f7f27f1cbb2cbda3c185c385f2b7af84f6bd7c0ce31b84742b15691 mongoose-7.14.tar.gz +sha256 7e2bc5dabbc27b431a530540161ba860906f12109d4b84b1e4bc8879f1afc3bc LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index e2e3be790a..d2cd45451e 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.13 +MONGOOSE_VERSION = 7.14 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE From 86b39fbe7ddfe716cfb67b624bf61e4e9ca1def1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 21 May 2024 21:00:01 +0200 Subject: [PATCH 15/49] package/dhcpdump: bump to version 1.9 - Switch to an active fork (which is already used by Fedora 39) - Drop patch (not needed since https://github.com/bbonev/dhcpdump/commit/be272278c3c3fd7fe0d30203d9047fff6b83fa44) - HAVE_STRSEP has been dropped since https://github.com/bbonev/dhcpdump/commit/0f7c525da62e7ae928782b2beae9c5313fb972f8 - CFLAGS and LDFLAGS must be set since https://github.com/bbonev/dhcpdump/commit/6eac74e7efb88bcce9423b3a452dcaa1d48850f0 - This bump will fix the following build failure with gcc 14 thanks to https://github.com/bbonev/dhcpdump/commit/be272278c3c3fd7fe0d30203d9047fff6b83fa44: dhcpdump.c: In function 'pcap_callback': dhcpdump.c:153:17: error: implicit declaration of function 'strftime' [-Wimplicit-function-declaration] 153 | strftime(timestamp, sizeof(timestamp), "%Y-%m-%d %H:%M:%S.", | ^~~~~~~~ dhcpdump.c:28:1: note: include '' or provide a declaration of 'strftime' 27 | #include "dhcp_options.h" +++ |+#include 28 | https://github.com/bbonev/dhcpdump/releases/tag/v1.9 Fixes: - http://autobuild.buildroot.org/results/9e559d634ac4e06f74f7b9e0402e45209aef2952 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../0001-use-non-bsd-structures.patch | 23 ------------------- package/dhcpdump/Config.in | 2 +- package/dhcpdump/dhcpdump.hash | 2 +- package/dhcpdump/dhcpdump.mk | 13 +++++------ 5 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch diff --git a/.checkpackageignore b/.checkpackageignore index 8f5fc0a476..543b6f33cf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -533,7 +533,6 @@ package/dhcp/S80dhcp-relay Shellcheck lib_sysv.Variables package/dhcp/S80dhcp-server Shellcheck lib_sysv.Variables package/dhcp/dhclient-script Shellcheck lib_shellscript.TrailingSpace package/dhcpcd/S41dhcpcd lib_sysv.Indent lib_sysv.Variables -package/dhcpdump/0001-use-non-bsd-structures.patch lib_patch.Upstream package/dhrystone/0001-cmdline-nruns.patch lib_patch.Sob lib_patch.Upstream package/dhrystone/0002-HZ.patch lib_patch.Sob lib_patch.Upstream package/dhrystone/0003-exit.patch lib_patch.Sob lib_patch.Upstream diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch deleted file mode 100644 index 40115fb640..0000000000 --- a/package/dhcpdump/0001-use-non-bsd-structures.patch +++ /dev/null @@ -1,23 +0,0 @@ -The udphdr structure has uh_* fields when _FAVOR_BSD is -defined. Otherwise, the fields are just named source, dest, len and -check. See . - -Signed-off-by: Thomas Petazzoni - -Index: dhcpdump-1.8/dhcpdump.c -=================================================================== ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 -@@ -163,10 +163,10 @@ - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); - -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) - return; - -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); - } - - // check for matching CHADDR (Peter Apian-Bennewitz ) diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in index e0abe040fc..30e42928e4 100644 --- a/package/dhcpdump/Config.in +++ b/package/dhcpdump/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP help A tool for monitoring dhcp requests using tcpdump. - http://www.mavetju.org/unix/general.php + https://github.com/bbonev/dhcpdump diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash index a24db5b275..fdf3243ad1 100644 --- a/package/dhcpdump/dhcpdump.hash +++ b/package/dhcpdump/dhcpdump.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz +sha256 3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1 dhcpdump-1.9.tar.xz sha256 bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192 LICENSE diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk index ec9571c0af..21cbd56b9c 100644 --- a/package/dhcpdump/dhcpdump.mk +++ b/package/dhcpdump/dhcpdump.mk @@ -4,8 +4,9 @@ # ################################################################################ -DHCPDUMP_VERSION = 1.8 -DHCPDUMP_SITE = http://www.mavetju.org/download +DHCPDUMP_VERSION = 1.9 +DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz +DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION) DHCPDUMP_DEPENDENCIES = libpcap DHCPDUMP_LICENSE = BSD-2-Clause DHCPDUMP_LICENSE_FILES = LICENSE @@ -15,12 +16,10 @@ ifeq ($(BR2_STATIC_LIBS),y) DHCPDUMP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` endif -# glibc, uclibc and musl have strsep() -DHCPDUMP_CFLAGS = $(TARGET_CFLAGS) -DHAVE_STRSEP - define DHCPDUMP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(DHCPDUMP_CFLAGS) \ - -D_GNU_SOURCE" LIBS="$(DHCPDUMP_LIBS)" dhcpdump + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(DHCPDUMP_LIBS)" dhcpdump endef define DHCPDUMP_INSTALL_TARGET_CMDS From cf9cd968a3a6a01fe72fae01bb6ea0dcccf9795f Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Wed, 22 May 2024 09:28:40 +0300 Subject: [PATCH 16/49] package/timescaledb: bump version to 2.15.0 Release notes: https://github.com/timescale/timescaledb/blob/2.15.0/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index f98098bdb8..ba81c74c7e 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c7768b267ea67914d0491b28da102faecd317060e429b2da7530517fbc94e73b timescaledb-2.14.2.tar.gz +sha256 ff2019f734566f73af0a8041db50f7f1d0ad6967f7e2e7d796d388cd38c0b5bb timescaledb-2.15.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index 59731270c5..d6c8164234 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.14.2 +TIMESCALEDB_VERSION = 2.15.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 42fad03182ed53de8003b66d50e893f42b72145e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Thu, 30 May 2024 22:32:56 +0200 Subject: [PATCH 17/49] packages: bump skalibs-related packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update all skarnet.org packages to their current upstream version: - execline - mdevd - s6 - s6-dns - s6-linux-init - s6-linux-utils - s6-networking - s6-portable-utils - s6-rc - skalibs This patch(set) updates the packages from skarnet.org. It is one commit to avoid build failures due to incompatible versions: for example, when only skalibs are updated, execline fails to build; conversely, bumping execline before skalibs also yields build failures. Signed-off-by: J. Neuschäfer [yann.morin.1998@free.fr: - cleanup commit title - reword commit log - include explanations why all bumps are done at once ] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - package/execline/execline.hash | 4 +- package/execline/execline.mk | 4 +- package/mdevd/mdevd.hash | 4 +- package/mdevd/mdevd.mk | 4 +- package/s6-dns/s6-dns.hash | 4 +- package/s6-dns/s6-dns.mk | 4 +- package/s6-linux-init/s6-linux-init.hash | 4 +- package/s6-linux-init/s6-linux-init.mk | 4 +- ...utils-rngseed.c-fix-build-with-glibc.patch | 39 ------------------- package/s6-linux-utils/s6-linux-utils.hash | 4 +- package/s6-linux-utils/s6-linux-utils.mk | 4 +- package/s6-networking/s6-networking.hash | 4 +- package/s6-networking/s6-networking.mk | 4 +- .../s6-portable-utils/s6-portable-utils.hash | 4 +- .../s6-portable-utils/s6-portable-utils.mk | 4 +- package/s6-rc/s6-rc.hash | 4 +- package/s6-rc/s6-rc.mk | 4 +- package/s6/s6.hash | 4 +- package/s6/s6.mk | 4 +- package/skalibs/skalibs.hash | 4 +- package/skalibs/skalibs.mk | 4 +- 22 files changed, 40 insertions(+), 80 deletions(-) delete mode 100644 package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch diff --git a/.checkpackageignore b/.checkpackageignore index 543b6f33cf..8345b6db95 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1379,7 +1379,6 @@ package/rubix/0002-misc-fixes.patch lib_patch.Sob lib_patch.Upstream package/rygel/0001-meson.build-fix-g_ir_compiler-calls.patch lib_patch.Upstream package/rygel/S99rygel Shellcheck lib_sysv.Indent lib_sysv.Variables package/s6-linux-init/0001-configure-add-D_GNU_SOURCE.patch lib_patch.Upstream -package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch lib_patch.Upstream package/safeclib/0001-fix-armv7-asm-inline-error-GH-115.patch lib_patch.Upstream package/samba4/0001-libreplace-disable-libbsd-support.patch lib_patch.Upstream package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch lib_patch.Upstream diff --git a/package/execline/execline.hash b/package/execline/execline.hash index 1d72e2cb49..3f9ff8a138 100644 --- a/package/execline/execline.hash +++ b/package/execline/execline.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 01260fcaf80ffbca2a94aa55ea474dfb9e39b3033b55c8af88126791879531f6 execline-2.9.0.1.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 df750035d0fb21c7265bffb7ed7e1b661de1e842944a2252bdcddc32d0d97217 execline-2.9.5.1.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/execline/execline.mk b/package/execline/execline.mk index 38f4570ba4..842ded6b88 100644 --- a/package/execline/execline.mk +++ b/package/execline/execline.mk @@ -4,8 +4,8 @@ # ################################################################################ -EXECLINE_VERSION = 2.9.0.1 -EXECLINE_SITE = http://skarnet.org/software/execline +EXECLINE_VERSION = 2.9.5.1 +EXECLINE_SITE = https://skarnet.org/software/execline EXECLINE_LICENSE = ISC EXECLINE_LICENSE_FILES = COPYING EXECLINE_INSTALL_STAGING = YES diff --git a/package/mdevd/mdevd.hash b/package/mdevd/mdevd.hash index dea2f14978..9436ed8b01 100644 --- a/package/mdevd/mdevd.hash +++ b/package/mdevd/mdevd.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 33cf2b118634538fd24f302b30f52cc8aa28ea68b414916ce482b54a4ee57283 mdevd-0.1.6.0.tar.gz -sha256 7fe938b5e0fec18848955ca8081c532e24ae77310beb730b301e1f77bad3d390 COPYING +sha256 f6ecf0ef7cd48d04efc75acb2dad967d850bc8815bdb0098f1c9ef043394d430 mdevd-0.1.6.3.tar.gz +sha256 b2edd59a202a710440522f05dcbf418b0493540120efcb407876772ee42d2c7c COPYING diff --git a/package/mdevd/mdevd.mk b/package/mdevd/mdevd.mk index 9997cb5275..c92659d961 100644 --- a/package/mdevd/mdevd.mk +++ b/package/mdevd/mdevd.mk @@ -4,8 +4,8 @@ # ################################################################################ -MDEVD_VERSION = 0.1.6.0 -MDEVD_SITE = http://skarnet.org/software/mdevd +MDEVD_VERSION = 0.1.6.3 +MDEVD_SITE = https://skarnet.org/software/mdevd MDEVD_LICENSE = ISC MDEVD_LICENSE_FILES = COPYING MDEVD_INSTALL_STAGING = YES diff --git a/package/s6-dns/s6-dns.hash b/package/s6-dns/s6-dns.hash index 5083024520..334ea1667c 100644 --- a/package/s6-dns/s6-dns.hash +++ b/package/s6-dns/s6-dns.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 76af222472c4754f83cdc59ad354255ce1b1e6f6833a059328463f8e51f4db43 s6-dns-2.3.5.4.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 cf0258574ec7d62b654e0c2ad78af4c7d67ac4c9cb37f781480f597e54b30f6d s6-dns-2.3.7.1.tar.gz +sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING diff --git a/package/s6-dns/s6-dns.mk b/package/s6-dns/s6-dns.mk index 1b7d65570f..a848f2e6c0 100644 --- a/package/s6-dns/s6-dns.mk +++ b/package/s6-dns/s6-dns.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_DNS_VERSION = 2.3.5.4 -S6_DNS_SITE = http://skarnet.org/software/s6-dns +S6_DNS_VERSION = 2.3.7.1 +S6_DNS_SITE = https://skarnet.org/software/s6-dns S6_DNS_LICENSE = ISC S6_DNS_LICENSE_FILES = COPYING S6_DNS_INSTALL_STAGING = YES diff --git a/package/s6-linux-init/s6-linux-init.hash b/package/s6-linux-init/s6-linux-init.hash index f70a4f87b5..25292c35b2 100644 --- a/package/s6-linux-init/s6-linux-init.hash +++ b/package/s6-linux-init/s6-linux-init.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 92055a7964cf66604066ad964a2c2392ee7c5e64821be03146c1341e0d8c3dc6 s6-linux-init-1.0.8.0.tar.gz -sha256 1898df1e8703bd9c1350d2ec3397880b9b4c1451038a9ce5e1c4b2e58622da39 COPYING +sha256 11ae08d0a66210b5e56b6baee0f6b9b1b69fbedb05fda1285b115a31ca46c77f s6-linux-init-1.1.2.0.tar.gz +sha256 f68451e55e6686dc187df1ca427c574d9ac0d6f6926e1bdb909ad8b657668fe5 COPYING diff --git a/package/s6-linux-init/s6-linux-init.mk b/package/s6-linux-init/s6-linux-init.mk index 6aec220de4..ae2bcdb8d8 100644 --- a/package/s6-linux-init/s6-linux-init.mk +++ b/package/s6-linux-init/s6-linux-init.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_LINUX_INIT_VERSION = 1.0.8.0 -S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init +S6_LINUX_INIT_VERSION = 1.1.2.0 +S6_LINUX_INIT_SITE = https://skarnet.org/software/s6-linux-init S6_LINUX_INIT_LICENSE = ISC S6_LINUX_INIT_LICENSE_FILES = COPYING S6_LINUX_INIT_DEPENDENCIES = s6 s6-linux-utils s6-portable-utils diff --git a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch b/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch deleted file mode 100644 index 2df8a99700..0000000000 --- a/package/s6-linux-utils/0001-src-s6-linux-utils-rngseed.c-fix-build-with-glibc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3ab8bdc1c657f91a2a96f4e6db308d17098de0c4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 23 Feb 2023 12:09:11 +0100 -Subject: [PATCH] src/s6-linux-utils/rngseed.c: fix build with glibc < - -getrandom and sys/random.h are only available since glibc 2.25 resulting -in the following build failure since version 2.6.0.0 and -https://github.com/skarnet/s6-linux-utils/commit/ad5973028c42d947440cdae5e4f106152c3dda28: - -src/minutils/rngseed.c:15:24: fatal error: sys/random.h: No such file or directory - #include - ^ - -Fixes: - - http://autobuild.buildroot.org/results/214bcecfc389cb412b68627c831300478d614a3a - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/skarnet/s6-linux-utils/pull/2] ---- - src/s6-linux-utils/rngseed.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/minutils/rngseed.c b/src/minutils/rngseed.c -index 2b1772c..223f50a 100644 ---- a/src/minutils/rngseed.c -+++ b/src/minutils/rngseed.c -@@ -12,7 +12,9 @@ - #include - #include - #include -+#ifdef SKALIBS_HASGETRANDOM - #include -+#endif - #include - - #include --- -2.39.1 - diff --git a/package/s6-linux-utils/s6-linux-utils.hash b/package/s6-linux-utils/s6-linux-utils.hash index c932a4363a..97a67c674e 100644 --- a/package/s6-linux-utils/s6-linux-utils.hash +++ b/package/s6-linux-utils/s6-linux-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 6c7132734a0c8287002ee6910c469f175a97d766a8023c0c33af8ba92643ed59 s6-linux-utils-2.6.0.0.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 8f944633ca87d3d23e0f03c9c383d1502d508c9bac16d38c3fbf723a5eab2bb7 s6-linux-utils-2.6.2.0.tar.gz +sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING diff --git a/package/s6-linux-utils/s6-linux-utils.mk b/package/s6-linux-utils/s6-linux-utils.mk index ffa3ffac5b..f83f47ac3e 100644 --- a/package/s6-linux-utils/s6-linux-utils.mk +++ b/package/s6-linux-utils/s6-linux-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_LINUX_UTILS_VERSION = 2.6.0.0 -S6_LINUX_UTILS_SITE = http://skarnet.org/software/s6-linux-utils +S6_LINUX_UTILS_VERSION = 2.6.2.0 +S6_LINUX_UTILS_SITE = https://skarnet.org/software/s6-linux-utils S6_LINUX_UTILS_LICENSE = ISC S6_LINUX_UTILS_LICENSE_FILES = COPYING S6_LINUX_UTILS_DEPENDENCIES = skalibs diff --git a/package/s6-networking/s6-networking.hash b/package/s6-networking/s6-networking.hash index 1890f95221..df65274b3d 100644 --- a/package/s6-networking/s6-networking.hash +++ b/package/s6-networking/s6-networking.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 7ac79d4de3d9c13532e444ab7497c4e04ad0fa7229d502984d9dc7d48aa64418 s6-networking-2.5.1.1.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 c33c6f1b2be16f89a21af946cfd06242a12f98184c898b755ddb24338671ceb1 s6-networking-2.7.0.2.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6-networking/s6-networking.mk b/package/s6-networking/s6-networking.mk index f740f22635..239d8a679e 100644 --- a/package/s6-networking/s6-networking.mk +++ b/package/s6-networking/s6-networking.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_NETWORKING_VERSION = 2.5.1.1 -S6_NETWORKING_SITE = http://skarnet.org/software/s6-networking +S6_NETWORKING_VERSION = 2.7.0.2 +S6_NETWORKING_SITE = https://skarnet.org/software/s6-networking S6_NETWORKING_LICENSE = ISC S6_NETWORKING_LICENSE_FILES = COPYING S6_NETWORKING_INSTALL_STAGING = YES diff --git a/package/s6-portable-utils/s6-portable-utils.hash b/package/s6-portable-utils/s6-portable-utils.hash index aa38c8b5da..2454e91a4d 100644 --- a/package/s6-portable-utils/s6-portable-utils.hash +++ b/package/s6-portable-utils/s6-portable-utils.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 ebb39f8934fd36f25d31352e61bbd94dc02b1e9f04411850d2fd9658bd916e36 s6-portable-utils-2.2.5.0.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 3e4492055d160c25fb90153f0efc277d7d52bf981bbe3ea2e9dfe51c493561ff s6-portable-utils-2.3.0.3.tar.gz +sha256 aafa4f6a12b5b24ab2ae8ead5174e1ec03aecb5eb0e82012d74fd47ccfc57607 COPYING diff --git a/package/s6-portable-utils/s6-portable-utils.mk b/package/s6-portable-utils/s6-portable-utils.mk index 8cdb4fa965..c40100b06c 100644 --- a/package/s6-portable-utils/s6-portable-utils.mk +++ b/package/s6-portable-utils/s6-portable-utils.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_PORTABLE_UTILS_VERSION = 2.2.5.0 -S6_PORTABLE_UTILS_SITE = http://skarnet.org/software/s6-portable-utils +S6_PORTABLE_UTILS_VERSION = 2.3.0.3 +S6_PORTABLE_UTILS_SITE = https://skarnet.org/software/s6-portable-utils S6_PORTABLE_UTILS_LICENSE = ISC S6_PORTABLE_UTILS_LICENSE_FILES = COPYING S6_PORTABLE_UTILS_DEPENDENCIES = skalibs diff --git a/package/s6-rc/s6-rc.hash b/package/s6-rc/s6-rc.hash index 0a84345e36..a09c08ba3c 100644 --- a/package/s6-rc/s6-rc.hash +++ b/package/s6-rc/s6-rc.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 4f24a4966a4aa353d2bd1a8afca9b88c7b7bd29c46b3a1a7f5305686b9d6e038 s6-rc-0.5.3.2.tar.gz -sha256 1898df1e8703bd9c1350d2ec3397880b9b4c1451038a9ce5e1c4b2e58622da39 COPYING +sha256 00bdfa596fa7161512e972ec9282a2abd8fd0e31f09177bad7a2bc3d8f283982 s6-rc-0.5.4.2.tar.gz +sha256 f68451e55e6686dc187df1ca427c574d9ac0d6f6926e1bdb909ad8b657668fe5 COPYING diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk index 85b047883b..61090c9a27 100644 --- a/package/s6-rc/s6-rc.mk +++ b/package/s6-rc/s6-rc.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_RC_VERSION = 0.5.3.2 -S6_RC_SITE = http://skarnet.org/software/s6-rc +S6_RC_VERSION = 0.5.4.2 +S6_RC_SITE = https://skarnet.org/software/s6-rc S6_RC_LICENSE = ISC S6_RC_LICENSE_FILES = COPYING S6_RC_INSTALL_STAGING = YES diff --git a/package/s6/s6.hash b/package/s6/s6.hash index 3c5ce4265a..fb5e74e403 100644 --- a/package/s6/s6.hash +++ b/package/s6/s6.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 6c1474be3e889dac392cee307abe015cd4be0c85c725c84ea7f184f0e34503a2 s6-2.11.1.2.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 c95d51787602e0c8c8e4f92a710cbdaa4ee797ee886e71342727e2974f95c06b s6-2.12.0.4.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/s6/s6.mk b/package/s6/s6.mk index 78962ed159..fb4910e28b 100644 --- a/package/s6/s6.mk +++ b/package/s6/s6.mk @@ -4,8 +4,8 @@ # ################################################################################ -S6_VERSION = 2.11.1.2 -S6_SITE = http://skarnet.org/software/s6 +S6_VERSION = 2.12.0.4 +S6_SITE = https://skarnet.org/software/s6 S6_LICENSE = ISC S6_LICENSE_FILES = COPYING S6_INSTALL_STAGING = YES diff --git a/package/skalibs/skalibs.hash b/package/skalibs/skalibs.hash index dd202b97fb..d871ee6503 100644 --- a/package/skalibs/skalibs.hash +++ b/package/skalibs/skalibs.hash @@ -1,3 +1,3 @@ # Locally generated -sha256 3e228f72f18d88c17f6c4e0a66881d6d3779427b7e7e889f3142b6f26da30285 skalibs-2.12.0.1.tar.gz -sha256 35126cb8f2ff2a6e359f7bfec46c49004ead6304d8248ba67dcdebcc7d377754 COPYING +sha256 b6b79b816f4ba0b6801676b0ed4179b59c8c7809eeffe26db672e404636befc3 skalibs-2.14.1.1.tar.gz +sha256 fdc931295525dd0009cdf339189cbecd228d65cefe33402f037f9b046f07989e COPYING diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk index 0ff449a5ba..67e3c694fc 100644 --- a/package/skalibs/skalibs.mk +++ b/package/skalibs/skalibs.mk @@ -4,8 +4,8 @@ # ################################################################################ -SKALIBS_VERSION = 2.12.0.1 -SKALIBS_SITE = http://skarnet.org/software/skalibs +SKALIBS_VERSION = 2.14.1.1 +SKALIBS_SITE = https://skarnet.org/software/skalibs SKALIBS_LICENSE = ISC SKALIBS_LICENSE_FILES = COPYING SKALIBS_INSTALL_STAGING = YES From f97e6293de1491e75b0798bddf4b0532c7f92bd2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 1 Jun 2024 12:04:17 +0200 Subject: [PATCH 18/49] utils/docker-run: set podman userns option in environment Commit 9a629f5 "utils/docker-run: allow running with Podman" added an option on system providing the podman command. This case is mainly for Fedora systems. Fedora repositories have a podman-docker package, that provides the docker command for compatibility. See [1]. In that case, invoking "docker" redirects to podman. When this package is installed on a Fedora system, both the docker and podman commands are available. Since the docker command is checked before podman, the --userns option is not passed in that case. This brings "permission denied" errors. Other cases are also possible, like a host system providing the real Docker alongside a podman installation. In such a case, to avoid unexpected change of behavior of the docker-run script, the original search order is preserved (search for "docker" first, then "podman"). This commit changes the way the podman user namespace mode is set. Rather than adding the "--userns=keep-id" command line option only in the podman case, it is globally set using the PODMAN_USERNS=keep-id environment variable [2]. Doing so makes sure that the variable will be consumed by the "docker" compatibility command, and just ignored by the real "docker" implementation. [1] https://packages.fedoraproject.org/pkgs/podman/podman-docker/ [2] https://docs.podman.io/en/latest/markdown/podman-run.1.html Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- utils/docker-run | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/docker-run b/utils/docker-run index 3dcabe2718..1adb02d74e 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -29,11 +29,16 @@ declare -a mountpoints=( "$(pwd)" ) +# We use the PODMAN_USERNS environment variable rather than using the +# --userns command line argument because Fedora system may have the +# podman-docker package installed, providing the "docker" +# compatibility command. +export PODMAN_USERNS="keep-id" + if command -v docker >/dev/null; then DOCKER="docker" elif command -v podman >/dev/null; then DOCKER="podman" - docker_opts+=( --userns=keep-id ) else echo "ERROR: Neither docker nor podman available!" >&2 exit 1 From 3423666fb90ecc858b7f53f1ae9c4120be4f8c8c Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:22 +0200 Subject: [PATCH 19/49] DEVELOPERS: add Thomas Perale for 'go' Signed-off-by: Thomas Perale Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 53ec6049a1..2914e3c8a8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -3031,6 +3031,9 @@ F: package/frotz/ F: package/kvm-unit-tests/ F: package/xorcurses/ +N: Thomas Perale +F: package/go/ + N: Thomas Petazzoni F: arch/Config.in.arm F: board/beaglev/ From 0290c543dec8aae7cedf2bf149a950fdf4e7a44a Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:23 +0200 Subject: [PATCH 20/49] package/go: new subdirectory for go variants Move every go compiler-related packages into a newly created package/go/ subdirectory. This subdirectory structure moves the GO_VERSION variable into the common package/go/go.mk file. In the next commits, host-go will be turned into a virtual-package and the common GO_VERSION force the providers to use the same Go compiler version. Common variables to all providers are kept in package/go/go.mk and package/go/Config.in.host. Also, the subdirectory structure forces the evaluation of the common GO_VERSION before the providers access it. Signed-off-by: Thomas Perale Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 +- DEVELOPERS | 3 -- package/Config.in.host | 3 -- package/go/Config.in.host | 4 ++ .../go-bootstrap-stage1/Config.in.host | 0 .../go-bootstrap-stage1.hash | 0 .../go-bootstrap-stage1.mk | 0 .../go-bootstrap-stage2/Config.in.host | 0 .../go-bootstrap-stage2.hash | 0 .../go-bootstrap-stage2.mk | 0 .../go-bootstrap-stage3/Config.in.host | 0 .../go-bootstrap-stage3.hash | 0 .../go-bootstrap-stage3.mk | 0 package/go/go.mk | 40 +------------- ...explicit-option-for-crosscompilation.patch | 0 ...ldvcs-false-when-building-go-bootstr.patch | 0 package/go/{ => go}/go.hash | 0 package/go/go/go.mk | 53 +++++++++++++++++++ 18 files changed, 60 insertions(+), 45 deletions(-) rename package/{ => go}/go-bootstrap-stage1/Config.in.host (100%) rename package/{ => go}/go-bootstrap-stage1/go-bootstrap-stage1.hash (100%) rename package/{ => go}/go-bootstrap-stage1/go-bootstrap-stage1.mk (100%) rename package/{ => go}/go-bootstrap-stage2/Config.in.host (100%) rename package/{ => go}/go-bootstrap-stage2/go-bootstrap-stage2.hash (100%) rename package/{ => go}/go-bootstrap-stage2/go-bootstrap-stage2.mk (100%) rename package/{ => go}/go-bootstrap-stage3/Config.in.host (100%) rename package/{ => go}/go-bootstrap-stage3/go-bootstrap-stage3.hash (100%) rename package/{ => go}/go-bootstrap-stage3/go-bootstrap-stage3.mk (100%) rename package/go/{ => go}/0001-build.go-explicit-option-for-crosscompilation.patch (100%) rename package/go/{ => go}/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch (100%) rename package/go/{ => go}/go.hash (100%) create mode 100644 package/go/go/go.mk diff --git a/.checkpackageignore b/.checkpackageignore index 8345b6db95..c25298d54b 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -715,7 +715,7 @@ package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch lib_patch.U package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch lib_patch.Upstream package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch lib_patch.Upstream package/gnuplot/0001-configure-add-without-demo-option.patch lib_patch.Upstream -package/go/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream +package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream diff --git a/DEVELOPERS b/DEVELOPERS index 2914e3c8a8..9cfc84dd65 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -616,9 +616,6 @@ F: package/docker-engine/ F: package/embiggen-disk/ F: package/fuse-overlayfs/ F: package/go/ -F: package/go-bootstrap-stage1/ -F: package/go-bootstrap-stage2/ -F: package/go-bootstrap-stage3/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index 986b2854d0..eacce5e448 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -44,9 +44,6 @@ menu "Host utilities" source "package/genpart/Config.in.host" source "package/gnupg/Config.in.host" source "package/go/Config.in.host" - source "package/go-bootstrap-stage1/Config.in.host" - source "package/go-bootstrap-stage2/Config.in.host" - source "package/go-bootstrap-stage3/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 0d89e875ad..7edf45850d 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -31,3 +31,7 @@ config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS + +source "package/go/go-bootstrap-stage1/Config.in.host" +source "package/go/go-bootstrap-stage2/Config.in.host" +source "package/go/go-bootstrap-stage3/Config.in.host" diff --git a/package/go-bootstrap-stage1/Config.in.host b/package/go/go-bootstrap-stage1/Config.in.host similarity index 100% rename from package/go-bootstrap-stage1/Config.in.host rename to package/go/go-bootstrap-stage1/Config.in.host diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.hash b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.hash similarity index 100% rename from package/go-bootstrap-stage1/go-bootstrap-stage1.hash rename to package/go/go-bootstrap-stage1/go-bootstrap-stage1.hash diff --git a/package/go-bootstrap-stage1/go-bootstrap-stage1.mk b/package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk similarity index 100% rename from package/go-bootstrap-stage1/go-bootstrap-stage1.mk rename to package/go/go-bootstrap-stage1/go-bootstrap-stage1.mk diff --git a/package/go-bootstrap-stage2/Config.in.host b/package/go/go-bootstrap-stage2/Config.in.host similarity index 100% rename from package/go-bootstrap-stage2/Config.in.host rename to package/go/go-bootstrap-stage2/Config.in.host diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go/go-bootstrap-stage2/go-bootstrap-stage2.hash similarity index 100% rename from package/go-bootstrap-stage2/go-bootstrap-stage2.hash rename to package/go/go-bootstrap-stage2/go-bootstrap-stage2.hash diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk similarity index 100% rename from package/go-bootstrap-stage2/go-bootstrap-stage2.mk rename to package/go/go-bootstrap-stage2/go-bootstrap-stage2.mk diff --git a/package/go-bootstrap-stage3/Config.in.host b/package/go/go-bootstrap-stage3/Config.in.host similarity index 100% rename from package/go-bootstrap-stage3/Config.in.host rename to package/go/go-bootstrap-stage3/Config.in.host diff --git a/package/go-bootstrap-stage3/go-bootstrap-stage3.hash b/package/go/go-bootstrap-stage3/go-bootstrap-stage3.hash similarity index 100% rename from package/go-bootstrap-stage3/go-bootstrap-stage3.hash rename to package/go/go-bootstrap-stage3/go-bootstrap-stage3.hash diff --git a/package/go-bootstrap-stage3/go-bootstrap-stage3.mk b/package/go/go-bootstrap-stage3/go-bootstrap-stage3.mk similarity index 100% rename from package/go-bootstrap-stage3/go-bootstrap-stage3.mk rename to package/go/go-bootstrap-stage3/go-bootstrap-stage3.mk diff --git a/package/go/go.mk b/package/go/go.mk index 43dfe1eae5..5aa61c6199 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -5,14 +5,7 @@ ################################################################################ GO_VERSION = 1.22.3 -GO_SITE = https://storage.googleapis.com/golang -GO_SOURCE = go$(GO_VERSION).src.tar.gz -GO_LICENSE = BSD-3-Clause -GO_LICENSE_FILES = LICENSE -GO_CPE_ID_VENDOR = golang - -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -96,15 +89,6 @@ else HOST_GO_CGO_ENABLED = 0 endif -HOST_GO_CROSS_ENV = \ - CC_FOR_TARGET="$(TARGET_CC)" \ - CXX_FOR_TARGET="$(TARGET_CXX)" \ - GOOS="linux" \ - GOARCH=$(GO_GOARCH) \ - $(if $(GO_GO386),GO386=$(GO_GO386)) \ - $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ - GO_ASSUME_CROSSCOMPILING=1 - else # !BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # host-go can still be used to build packages for the host. No need to set all # the arch stuff since we will not be cross-compiling. @@ -123,27 +107,7 @@ HOST_GO_HOST_ENV = \ CGO_CXXFLAGS="$(HOST_CXXFLAGS)" \ CGO_LDFLAGS="$(HOST_LDFLAGS)" -# The go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. -HOST_GO_MAKE_ENV = \ - GO111MODULE=off \ - GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ - GOROOT_FINAL=$(HOST_GO_ROOT) \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - GOOS=linux \ - CC=$(HOSTCC_NOCCACHE) \ - CXX=$(HOSTCXX_NOCCACHE) \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - $(HOST_GO_CROSS_ENV) - -define HOST_GO_BUILD_CMDS - cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) -endef - -define HOST_GO_INSTALL_CMDS +define GO_BINARIES_INSTALL $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_ROOT)/bin/go $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt @@ -165,4 +129,4 @@ define HOST_GO_INSTALL_CMDS find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; endef -$(eval $(host-generic-package)) +include $(sort $(wildcard package/go/*/*.mk)) diff --git a/package/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch similarity index 100% rename from package/go/0001-build.go-explicit-option-for-crosscompilation.patch rename to package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch diff --git a/package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch similarity index 100% rename from package/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch rename to package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch diff --git a/package/go/go.hash b/package/go/go/go.hash similarity index 100% rename from package/go/go.hash rename to package/go/go/go.hash diff --git a/package/go/go/go.mk b/package/go/go/go.mk new file mode 100644 index 0000000000..c3c40922f4 --- /dev/null +++ b/package/go/go/go.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# go +# +################################################################################ + +GO_SITE = https://storage.googleapis.com/golang +GO_SOURCE = go$(GO_VERSION).src.tar.gz + +GO_LICENSE = BSD-3-Clause +GO_LICENSE_FILES = LICENSE +GO_CPE_ID_VENDOR = golang + +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3 + +ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) + +HOST_GO_CROSS_ENV = \ + CC_FOR_TARGET="$(TARGET_CC)" \ + CXX_FOR_TARGET="$(TARGET_CXX)" \ + GOOS="linux" \ + GOARCH=$(GO_GOARCH) \ + $(if $(GO_GO386),GO386=$(GO_GO386)) \ + $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ + GO_ASSUME_CROSSCOMPILING=1 + +endif + +# The go build system is not compatible with ccache, so use +# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +HOST_GO_MAKE_ENV = \ + GO111MODULE=off \ + GOCACHE=$(HOST_GO_HOST_CACHE) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ + GOROOT_FINAL=$(HOST_GO_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ + $(HOST_GO_CROSS_ENV) + +define HOST_GO_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_INSTALL_CMDS + $(GO_BINARIES_INSTALL) +endef + +$(eval $(host-generic-package)) From 58a291470acf458239202bd81bfc642b9cadd298 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:24 +0200 Subject: [PATCH 21/49] package/pkg-golang: select BR2_PACKAGE_HOST_GO Makes every packages built by the Go compiler select a new variable introduced in this patch: BR2_PACKAGE_HOST_GO. In later commits Go compiler variant will be introduced (built from source, pre-built binaries) and selecting BR2_PACKAGE_HOST_GO will force to add host-go provider to the dependency list. The same pattern is used for Rust packages. Signed-off-by: Thomas Perale Signed-off-by: Yann E. MORIN --- package/balena-engine/Config.in | 1 + package/cni-plugins/Config.in | 1 + package/containerd/Config.in | 1 + package/crucible/Config.in | 1 + package/delve/Config.in | 1 + package/delve/Config.in.host | 1 + package/docker-cli/Config.in | 1 + package/docker-compose/Config.in | 1 + package/docker-engine/Config.in | 1 + package/embiggen-disk/Config.in | 1 + package/flannel/Config.in | 1 + package/gitlab-runner/Config.in | 1 + package/go/Config.in.host | 5 +++++ package/gocryptfs/Config.in | 1 + package/mender-artifact/Config.in.host | 1 + package/mender-connect/Config.in | 1 + package/mender/Config.in | 1 + package/moby-buildkit/Config.in | 1 + package/moby-buildkit/Config.in.host | 1 + package/nerdctl/Config.in | 1 + package/runc/Config.in | 1 + package/runc/Config.in.host | 1 + package/tinifier/Config.in | 1 + package/wtfutil/Config.in | 1 + 24 files changed, 28 insertions(+) diff --git a/package/balena-engine/Config.in b/package/balena-engine/Config.in index 02f694515e..5966b33f58 100644 --- a/package/balena-engine/Config.in +++ b/package/balena-engine/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_BALENA_ENGINE depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_IPTABLES # runtime select BR2_PACKAGE_UTIL_LINUX # runtime select BR2_PACKAGE_UTIL_LINUX_BINARIES # runtime diff --git a/package/cni-plugins/Config.in b/package/cni-plugins/Config.in index 25e6ff534d..6d4ca0a5b4 100644 --- a/package/cni-plugins/Config.in +++ b/package/cni-plugins/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_CNI_PLUGINS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU + select BR2_PACKAGE_HOST_GO help Container Networking Interface plugins. diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 2dd04b109c..f014c56e10 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_CONTAINERD depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime dependency select BR2_PACKAGE_UTIL_LINUX # runtime dependency select BR2_PACKAGE_UTIL_LINUX_BINARIES diff --git a/package/crucible/Config.in b/package/crucible/Config.in index b27eb31ae5..1e1b29c3df 100644 --- a/package/crucible/Config.in +++ b/package/crucible/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CRUCIBLE bool "crucible" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help Crucible is a One-Time-Programmable (OTP) fusing tool for the i.MX family. diff --git a/package/delve/Config.in b/package/delve/Config.in index 9428e4016a..288dc1ea15 100644 --- a/package/delve/Config.in +++ b/package/delve/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_DELVE_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + select BR2_PACKAGE_HOST_GO config BR2_PACKAGE_DELVE bool "delve" diff --git a/package/delve/Config.in.host b/package/delve/Config.in.host index dab5ca8914..0938ab0659 100644 --- a/package/delve/Config.in.host +++ b/package/delve/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_DELVE bool "host delve" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help Delve is a debugger for the Go programming language. diff --git a/package/docker-cli/Config.in b/package/docker-cli/Config.in index 6f187c9d22..52e7f7c871 100644 --- a/package/docker-cli/Config.in +++ b/package/docker-cli/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_DOCKER_CLI depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help Docker is a platform to build, ship, and run applications as lightweight containers. diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in index 59128f7a19..f3560e402b 100644 --- a/package/docker-compose/Config.in +++ b/package/docker-compose/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_DOCKER_COMPOSE depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_DOCKER_CLI + select BR2_PACKAGE_HOST_GO help Multi-container applications with the Docker CLI. diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index d48ffe6484..49a002a647 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_DOCKER_ENGINE depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # libseccomp select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency select BR2_PACKAGE_CONTAINERD # runtime dependency + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_IPTABLES # runtime dependency select BR2_PACKAGE_LIBSECCOMP help diff --git a/package/embiggen-disk/Config.in b/package/embiggen-disk/Config.in index 667d71c86e..c323fb1b6d 100644 --- a/package/embiggen-disk/Config.in +++ b/package/embiggen-disk/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_EMBIGGEN_DISK depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve depends on BR2_USE_MMU # util-linux + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_UTIL_LINUX # sfdisk select BR2_PACKAGE_UTIL_LINUX_BINARIES # sfdisk help diff --git a/package/flannel/Config.in b/package/flannel/Config.in index eb8d798f48..f37cfaa9cc 100644 --- a/package/flannel/Config.in +++ b/package/flannel/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_FLANNEL depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help Flannel is a virtual network that gives a subnet to each host for use with container runtimes. diff --git a/package/gitlab-runner/Config.in b/package/gitlab-runner/Config.in index 4289613ab9..cfe8c941bc 100644 --- a/package/gitlab-runner/Config.in +++ b/package/gitlab-runner/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_GITLAB_RUNNER select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash select BR2_PACKAGE_CA_CERTIFICATES # runtime select BR2_PACKAGE_GIT # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_LIBCURL # runtime select BR2_PACKAGE_LIBCURL_CURL # runtime select BR2_PACKAGE_LIBCURL_FORCE_TLS # runtime diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 7edf45850d..e1833d0905 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -32,6 +32,11 @@ config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS default y depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS +# Go packages should select BR2_PACKAGE_HOST_GO +config BR2_PACKAGE_HOST_GO + bool + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + source "package/go/go-bootstrap-stage1/Config.in.host" source "package/go/go-bootstrap-stage2/Config.in.host" source "package/go/go-bootstrap-stage3/Config.in.host" diff --git a/package/gocryptfs/Config.in b/package/gocryptfs/Config.in index 2630cafdcf..2c70b9b21b 100644 --- a/package/gocryptfs/Config.in +++ b/package/gocryptfs/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_GOCRYPTFS bool "gocryptfs" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help gocryptfs is an encrypted FUSE overlay filesystem. diff --git a/package/mender-artifact/Config.in.host b/package/mender-artifact/Config.in.host index c7be0ed261..39353b23e7 100644 --- a/package/mender-artifact/Config.in.host +++ b/package/mender-artifact/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MENDER_ARTIFACT bool "host mender-artifact" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help The mender-artifact tool is a CLI implementation of the Mender artifacts library. diff --git a/package/mender-connect/Config.in b/package/mender-connect/Config.in index 0845910880..d478e468c2 100644 --- a/package/mender-connect/Config.in +++ b/package/mender-connect/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MENDER_CONNECT depends on BR2_USE_WCHAR # libglib2 -> gettext depends on BR2_USE_MMU # dbus -> fork() select BR2_PACKAGE_DBUS # runtime + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_MENDER # runtime select BR2_PACKAGE_OPENSSL diff --git a/package/mender/Config.in b/package/mender/Config.in index 7d768cebec..4831548f76 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 diff --git a/package/moby-buildkit/Config.in b/package/moby-buildkit/Config.in index 93c852bcdb..1a0b599097 100644 --- a/package/moby-buildkit/Config.in +++ b/package/moby-buildkit/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_MOBY_BUILDKIT depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_USE_MMU select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + select BR2_PACKAGE_HOST_GO help BuildKit is a toolkit for converting source code to build artifacts in an efficient, expressive and repeatable manner. diff --git a/package/moby-buildkit/Config.in.host b/package/moby-buildkit/Config.in.host index a3b18548f8..d4eb0d74c3 100644 --- a/package/moby-buildkit/Config.in.host +++ b/package/moby-buildkit/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_MOBY_BUILDKIT bool "host moby-buildkit" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help BuildKit is a toolkit for converting source code to build artifacts in an efficient expressive and repeatable manner. diff --git a/package/nerdctl/Config.in b/package/nerdctl/Config.in index 969b9bb40e..062b36ab85 100644 --- a/package/nerdctl/Config.in +++ b/package/nerdctl/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_NERDCTL depends on !BR2_TOOLCHAIN_USES_UCLIBC # containerd depends on BR2_USE_MMU # util-linux select BR2_PACKAGE_CONTAINERD # runtime + select BR2_PACKAGE_HOST_GO help Docker-compatible CLI for containerd, controlling runc. diff --git a/package/runc/Config.in b/package/runc/Config.in index fe527b1954..73eac72527 100644 --- a/package/runc/Config.in +++ b/package/runc/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_RUNC depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + select BR2_PACKAGE_HOST_GO help runC is a CLI tool for spawning and running containers according to the OCI specification. diff --git a/package/runc/Config.in.host b/package/runc/Config.in.host index 4b2555e029..78193cb499 100644 --- a/package/runc/Config.in.host +++ b/package/runc/Config.in.host @@ -1,6 +1,7 @@ config BR2_PACKAGE_HOST_RUNC bool "host runc" depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help runC is a CLI tool for spawning and running containers according to the OCI specification. diff --git a/package/tinifier/Config.in b/package/tinifier/Config.in index fbadfe6bd9..eae8b8f499 100644 --- a/package/tinifier/Config.in +++ b/package/tinifier/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TINIFIER bool "tinifier" depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help CLI tool for images compressing diff --git a/package/wtfutil/Config.in b/package/wtfutil/Config.in index 8c3efcea5d..3fd8c41bab 100644 --- a/package/wtfutil/Config.in +++ b/package/wtfutil/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_WTFUTIL bool "wtfutil" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_GO help WTF is the personal information dashboard for your terminal. From fa2536ec940105acc71630144bd1187c931462ac Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:25 +0200 Subject: [PATCH 22/49] package/go: make host package a virtual package Turns host-go into a virtual package, with a single providers: - host-go-src, which builds host-go from source based on the same logic that was previously used in package/go/go/go.mk, now moved to package/go/go-src/go-src.mk to remove any ambiguity on the role of the package. In later commits, we'll add host-go-bin a prebuilt binary host go compiler as another provider. A similar solution is proposed for host-rust. Signed-off-by: Thomas Perale Signed-off-by: Yann E. MORIN --- .checkpackageignore | 2 +- package/go/Config.in.host | 24 +++++++++++++++++ ...explicit-option-for-crosscompilation.patch | 0 ...ldvcs-false-when-building-go-bootstr.patch | 0 package/go/{go/go.hash => go-src/go-src.hash} | 0 package/go/{go/go.mk => go-src/go-src.mk} | 27 ++++++++++--------- package/go/go.mk | 2 ++ 7 files changed, 41 insertions(+), 14 deletions(-) rename package/go/{go => go-src}/0001-build.go-explicit-option-for-crosscompilation.patch (100%) rename package/go/{go => go-src}/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch (100%) rename package/go/{go/go.hash => go-src/go-src.hash} (100%) rename package/go/{go/go.mk => go-src/go-src.mk} (66%) diff --git a/.checkpackageignore b/.checkpackageignore index c25298d54b..25ad6f1d63 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -715,7 +715,7 @@ package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch lib_patch.U package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch lib_patch.Upstream package/gnupg/0001-build-Always-use-EXTERN_UNLESS_MAIN_MODULE-pattern.patch lib_patch.Upstream package/gnuplot/0001-configure-add-without-demo-option.patch lib_patch.Upstream -package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream +package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch lib_patch.Upstream package/gob2/0001-dont-include-from-prefix.patch lib_patch.Upstream package/gobject-introspection/0001-disable-tests.patch lib_patch.Upstream package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch.Upstream diff --git a/package/go/Config.in.host b/package/go/Config.in.host index e1833d0905..483393f8e4 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -37,6 +37,30 @@ config BR2_PACKAGE_HOST_GO bool depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS +if BR2_PACKAGE_HOST_GO + +choice + prompt "Go compiler variant" + default BR2_PACKAGE_HOST_GO_SRC + help + Select a Go compiler variant. + + Default to 'host-go-src'. + +config BR2_PACKAGE_HOST_GO_SRC + bool "host go (source)" + help + This package will build the go compiler for the host. + +endchoice + +config BR2_PACKAGE_PROVIDES_HOST_GO + string + # Default to host-go-src + default "host-go-src" if BR2_PACKAGE_HOST_GO_SRC + +endif + source "package/go/go-bootstrap-stage1/Config.in.host" source "package/go/go-bootstrap-stage2/Config.in.host" source "package/go/go-bootstrap-stage3/Config.in.host" diff --git a/package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch b/package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch similarity index 100% rename from package/go/go/0001-build.go-explicit-option-for-crosscompilation.patch rename to package/go/go-src/0001-build.go-explicit-option-for-crosscompilation.patch diff --git a/package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch b/package/go/go-src/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch similarity index 100% rename from package/go/go/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch rename to package/go/go-src/0002-cmd-dist-set-buildvcs-false-when-building-go-bootstr.patch diff --git a/package/go/go/go.hash b/package/go/go-src/go-src.hash similarity index 100% rename from package/go/go/go.hash rename to package/go/go-src/go-src.hash diff --git a/package/go/go/go.mk b/package/go/go-src/go-src.mk similarity index 66% rename from package/go/go/go.mk rename to package/go/go-src/go-src.mk index c3c40922f4..1e061e20bc 100644 --- a/package/go/go/go.mk +++ b/package/go/go-src/go-src.mk @@ -1,21 +1,22 @@ ################################################################################ # -# go +# go-src # ################################################################################ -GO_SITE = https://storage.googleapis.com/golang -GO_SOURCE = go$(GO_VERSION).src.tar.gz +GO_SRC_SITE = https://storage.googleapis.com/golang +GO_SRC_SOURCE = go$(GO_VERSION).src.tar.gz -GO_LICENSE = BSD-3-Clause -GO_LICENSE_FILES = LICENSE -GO_CPE_ID_VENDOR = golang +GO_SRC_LICENSE = BSD-3-Clause +GO_SRC_LICENSE_FILES = LICENSE +GO_SRC_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3 +HOST_GO_SRC_PROVIDES = host-go +HOST_GO_SRC_DEPENDENCIES = host-go-bootstrap-stage3 ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) -HOST_GO_CROSS_ENV = \ +HOST_GO_SRC_CROSS_ENV = \ CC_FOR_TARGET="$(TARGET_CC)" \ CXX_FOR_TARGET="$(TARGET_CXX)" \ GOOS="linux" \ @@ -28,7 +29,7 @@ endif # The go build system is not compatible with ccache, so use # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. -HOST_GO_MAKE_ENV = \ +HOST_GO_SRC_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ @@ -39,14 +40,14 @@ HOST_GO_MAKE_ENV = \ CC=$(HOSTCC_NOCCACHE) \ CXX=$(HOSTCXX_NOCCACHE) \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - $(HOST_GO_CROSS_ENV) + $(HOST_GO_SRC_CROSS_ENV) -define HOST_GO_BUILD_CMDS +define HOST_GO_SRC_BUILD_CMDS cd $(@D)/src && \ - $(HOST_GO_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) + $(HOST_GO_SRC_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) endef -define HOST_GO_INSTALL_CMDS +define HOST_GO_SRC_INSTALL_CMDS $(GO_BINARIES_INSTALL) endef diff --git a/package/go/go.mk b/package/go/go.mk index 5aa61c6199..dfcb633aa7 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -129,4 +129,6 @@ define GO_BINARIES_INSTALL find $(HOST_GO_ROOT) -type f -exec touch -r $(@D)/bin/go {} \; endef +$(eval $(host-virtual-package)) + include $(sort $(wildcard package/go/*/*.mk)) From 9cf5c95e38488f79a4a27ca7a27a5875029cbbe4 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 15 Apr 2024 18:22:27 +0200 Subject: [PATCH 23/49] support/testing: add tests for Go providers Test the source provider of host-go to build a Go package. The tests consist of building and installing a Go package in the root file system of an ARM vexpress QEMU system. Signed-off-by: Thomas Perale [yann.morin.1998@free.fr: drop the go-bin test-case] Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_go.py | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 support/testing/tests/package/test_go.py diff --git a/support/testing/tests/package/test_go.py b/support/testing/tests/package/test_go.py new file mode 100644 index 0000000000..0b25fbc26d --- /dev/null +++ b/support/testing/tests/package/test_go.py @@ -0,0 +1,27 @@ +import os + +import infra.basetest + + +class TestGoBase(infra.basetest.BRTest): + + def login(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() + + +class TestGoSource(TestGoBase): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_PACKAGE_HOST_GO=y + BR2_PACKAGE_HOST_GO_SRC=y + BR2_PACKAGE_TINIFIER=y + """ + + def test_run(self): + self.login() + self.assertRunOk("tinifier -h") From 6c8a7a7bc92f56b53b2602727a12aa13e3248d24 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Wed, 29 May 2024 20:24:24 +0000 Subject: [PATCH 24/49] package/mtd: bump to version 2.2.0 https://lists.infradead.org/pipermail/linux-mtd/2024-March/104058.html Signed-off-by: Brandon Maier Signed-off-by: Yann E. MORIN --- package/mtd/mtd.hash | 4 ++-- package/mtd/mtd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mtd/mtd.hash b/package/mtd/mtd.hash index 9926a34a80..1efb06f490 100644 --- a/package/mtd/mtd.hash +++ b/package/mtd/mtd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://infraroot.at/pub/mtd/mtd-utils-2.1.6.tar.bz2.asc -sha256 c1d853bc4adf83bcabd2792fc95af33bdd8643c97e8f7b3f0180af36af76f0e5 mtd-utils-2.1.6.tar.bz2 +# https://infraroot.at/pub/mtd/mtd-utils-2.2.0.tar.bz2.asc +sha256 250d082f67375ca8451b5fcfc9a23a53ced3ebebd8312c288daf2507bbab1324 mtd-utils-2.2.0.tar.bz2 sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 998cc419b3..f71179c2de 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.1.6 +MTD_VERSION = 2.2.0 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0 From 363a0fb1461aaeb6bb1185f231bee19f513a8c52 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 1 Jun 2024 14:59:30 +0200 Subject: [PATCH 25/49] package/nano: bump to version 8.0 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/nano/nano.hash | 4 ++-- package/nano/nano.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nano/nano.hash b/package/nano/nano.hash index 3ca37c6337..fc9a0947a3 100644 --- a/package/nano/nano.hash +++ b/package/nano/nano.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.nano-editor.org/dist/v7/nano-7.2.tar.xz.asc +# https://www.nano-editor.org/dist/v8/nano-8.0.tar.xz.asc # using key 168E6F4297BFD7A79AFD4496514BBE2EB8E1961F -sha256 86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526 nano-7.2.tar.xz +sha256 c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4 nano-8.0.tar.xz sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 8b93527bec..72f4de6a0a 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -4,8 +4,8 @@ # ################################################################################ -NANO_VERSION_MAJOR = 7 -NANO_VERSION = $(NANO_VERSION_MAJOR).2 +NANO_VERSION_MAJOR = 8 +NANO_VERSION = $(NANO_VERSION_MAJOR).0 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) NANO_SOURCE = nano-$(NANO_VERSION).tar.xz NANO_LICENSE = GPL-3.0+ From a0d47a69916e7e143059ee21d6b70a5a65abfefc Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 1 Jun 2024 14:59:41 +0200 Subject: [PATCH 26/49] package/libfribidi: bump to version 1.0.14 Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN --- package/libfribidi/libfribidi.hash | 2 +- package/libfribidi/libfribidi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libfribidi/libfribidi.hash b/package/libfribidi/libfribidi.hash index 9187112cee..b37fb92236 100644 --- a/package/libfribidi/libfribidi.hash +++ b/package/libfribidi/libfribidi.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7fa16c80c81bd622f7b198d31356da139cc318a63fc7761217af4130903f54a2 fribidi-1.0.13.tar.xz +sha256 76ae204a7027652ac3981b9fa5817c083ba23114340284c58e756b259cd2259a fribidi-1.0.14.tar.xz sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING diff --git a/package/libfribidi/libfribidi.mk b/package/libfribidi/libfribidi.mk index ba0859c93d..7c6d32fb76 100644 --- a/package/libfribidi/libfribidi.mk +++ b/package/libfribidi/libfribidi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBFRIBIDI_VERSION = 1.0.13 +LIBFRIBIDI_VERSION = 1.0.14 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.xz LIBFRIBIDI_SITE = https://github.com/fribidi/fribidi/releases/download/v$(LIBFRIBIDI_VERSION) LIBFRIBIDI_LICENSE = LGPL-2.1+ From 1d127da425c3b7f7f483968d038a73d32f592263 Mon Sep 17 00:00:00 2001 From: Sebastien Laveze Date: Wed, 29 May 2024 09:29:10 +0200 Subject: [PATCH 27/49] package/mosquitto: build mosquitto_{ctrl,passwd} if the broker is enabled The tools require openssl (and cjson for mosquitto_ctrl), and are silently skipped by the mosquitto build system if those are not available. The tools are small compared to the broker and dependencies: -rwxr-xr-x 1 peko peko 4.8M Jun 1 00:42 target/usr/lib/libcrypto.so.3 -rwxr-xr-x 1 peko peko 968K Jun 1 00:42 target/usr/lib/libssl.so.3 -rwxr-xr-x 1 peko peko 266K Jun 1 00:42 target/usr/sbin/mosquitto -rwxr-xr-x 1 peko peko 54K Jun 1 00:42 target/usr/bin/mosquitto_ctrl -rwxr-xr-x 1 peko peko 34K Jun 1 00:42 target/usr/lib/libcjson.so.1.7.18 -rwxr-xr-x 1 peko peko 26K Jun 1 00:42 target/usr/bin/mosquitto_passwd So automatically build them (if the dependencies are available) when the broker is built. Notice: We have to explicitly build apps/mosquitto_ctrl + apps/mosquitto_passwd and not just apps, as apps/Makefile uses a DIRS variable that conflicts with the DIRS=.. we pass to the toplevel Makefile. Signed-off-by: Sebastien Laveze [Peter: drop dedicated option, also handle mosquitto_ctrl] Signed-off-by: Peter Korsgaard --- package/mosquitto/mosquitto.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index b847e56fec..6b249c37fd 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -91,7 +91,7 @@ endif MOSQUITTO_MAKE_DIRS = lib client ifeq ($(BR2_PACKAGE_MOSQUITTO_BROKER),y) -MOSQUITTO_MAKE_DIRS += src +MOSQUITTO_MAKE_DIRS += src apps/mosquitto_ctrl apps/mosquitto_passwd endif define MOSQUITTO_BUILD_CMDS From 0deb8c4c5dcae01e1da772e2e1540aa989e8af8b Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Sun, 2 Jun 2024 16:19:54 +0200 Subject: [PATCH 28/49] package/ncftp: bump to version 3.2.7 Change download location as the new version is not available at the old location. Remove already upstreamed patch. Signed-off-by: Yegor Yefremov Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - package/ncftp/0001-fix-gcc-10.patch | 24 ------------------------ package/ncftp/ncftp.hash | 2 +- package/ncftp/ncftp.mk | 8 +++----- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 package/ncftp/0001-fix-gcc-10.patch diff --git a/.checkpackageignore b/.checkpackageignore index 25ad6f1d63..c3de61111f 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1086,7 +1086,6 @@ package/musl/0001-avoid-kernel-if_ether.h.patch lib_patch.Upstream package/musl/0002-package-musl-Make-scheduler-functions-Linux-compatib.patch lib_patch.Upstream package/nano/0001-lib-getrandom.c-fix-build-with-uclibc-1.0.35.patch lib_patch.Upstream package/nanocom/0001-fix-build-with-gcc-10.patch lib_patch.Upstream -package/ncftp/0001-fix-gcc-10.patch lib_patch.Upstream package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch lib_patch.Upstream package/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch lib_patch.Upstream package/ne10/0002-fix-build-without-C.patch lib_patch.Upstream diff --git a/package/ncftp/0001-fix-gcc-10.patch b/package/ncftp/0001-fix-gcc-10.patch deleted file mode 100644 index 8ff9c44c50..0000000000 --- a/package/ncftp/0001-fix-gcc-10.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build with gcc 10 - -Add missing extern to gBm to fix the following build failure with --fno-common which is enabled by default with gcc 10: - -/usr/lfs/hdd_v1/rc-buildroot-test/scripts/instance-0/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: bookmark.o:(.bss+0x10): multiple definition of `gBm'; gpshare.o:(.bss+0x24): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/78822bc0e0039e8f8949011a256cac022863276f - -Signed-off-by: Fabrice Fontaine - -diff -Nura ncftp-3.2.6-orig/sh_util/gpshare.c ncftp-3.2.6/sh_util/gpshare.c ---- ncftp-3.2.6-orig/sh_util/gpshare.c 2020-08-21 10:46:34.173816750 +0200 -+++ ncftp-3.2.6/sh_util/gpshare.c 2020-08-21 10:52:25.407976319 +0200 -@@ -28,7 +28,7 @@ - - static int gIsAtty1 = 1, gIsAtty2 = 1; - extern int gLoadedBm, gBookmarkMatchMode; --Bookmark gBm; -+extern Bookmark gBm; - - double - FileSize(double size, const char **uStr0, double *uMult0) diff --git a/package/ncftp/ncftp.hash b/package/ncftp/ncftp.hash index 3ab27df5cc..3e390b1015 100644 --- a/package/ncftp/ncftp.hash +++ b/package/ncftp/ncftp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23 ncftp-3.2.6-src.tar.gz +sha256 d41c5c4d6614a8eae2ed4e4d7ada6b6d3afcc9fb65a4ed9b8711344bef24f7e8 ncftp-3.2.7-src.tar.xz sha256 4fe2f063d25d79c49712a272ebb68e050c703eed9c66c80108427edfe3285580 doc/LICENSE.txt diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 676a9c5895..a3aa3fb194 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -4,11 +4,9 @@ # ################################################################################ -NCFTP_VERSION = 3.2.6 -# use .gz as upstream .xz tarball has changed after the hash was added for -# 2017.02. Can be changed back to .xz when version is bumped -NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz -NCFTP_SITE = ftp://ftp.ncftp.com/ncftp +NCFTP_VERSION = 3.2.7 +NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz +NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = Clarified Artistic License NCFTP_LICENSE_FILES = doc/LICENSE.txt From 7c53563f9d0a2f7b90007da9a1e470d25ef75ef0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 2 Jun 2024 14:41:39 -0600 Subject: [PATCH 29/49] package/vala: bump to version 0.56.17 Set GI_GIRDIR env variable which is now required for configure to function. Details: https://gitlab.gnome.org/GNOME/vala/-/commit/a9d38070ce86d7994b949f7cb426fbf670a953d8 Signed-off-by: James Hilliard [yann.morin.1998@free.fr: drop spurious reflow of _DEPENDENCIES] Signed-off-by: Yann E. MORIN --- package/vala/vala.hash | 4 ++-- package/vala/vala.mk | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/vala/vala.hash b/package/vala/vala.hash index b3716f0854..a16875ac6a 100644 --- a/package/vala/vala.hash +++ b/package/vala/vala.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/vala/0.56/vala-0.56.14.sha256sum -sha256 9382c268ca9bdc02aaedc8152a9818bf3935273041f629c56de410e360a3f557 vala-0.56.14.tar.xz +# From https://download.gnome.org/sources/vala/0.56/vala-0.56.17.sha256sum +sha256 26100c4e4ef0049c619275f140d97cf565883d00c7543c82bcce5a426934ed6a vala-0.56.17.tar.xz # Locally computed sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/vala/vala.mk b/package/vala/vala.mk index 415d996faa..85f928202a 100644 --- a/package/vala/vala.mk +++ b/package/vala/vala.mk @@ -5,7 +5,7 @@ ################################################################################ VALA_VERSION_MAJOR = 0.56 -VALA_VERSION = $(VALA_VERSION_MAJOR).14 +VALA_VERSION = $(VALA_VERSION_MAJOR).17 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) VALA_SOURCE = vala-$(VALA_VERSION).tar.xz VALA_LICENSE = LGPL-2.1+ @@ -15,7 +15,9 @@ VALA_CPE_ID_VENDOR = gnome HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 # Yes, the autoconf script understands ':' as "xsltproc is not # available". -HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=: +HOST_VALA_CONF_ENV = \ + ac_cv_path_XSLTPROC=: \ + GI_GIRDIR="$(STAGING_DIR)/usr/share/gir-1.0" HOST_VALA_CONF_OPTS += --disable-valadoc # We wrap vala, valac and vapigen to point to the proper gir and vapi data dirs From 1e81379b940f0b530c1c5f56c5e08a5d0b971098 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 3 Jun 2024 19:32:09 +0200 Subject: [PATCH 30/49] package/libgpg-error: bump to version 1.49 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.hash | 4 ++-- package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index 3b3464592a..f87accdd97 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,6 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 8bdb504750b4da9e7daffa164cf1ed9900671f32 libgpg-error-1.48.tar.bz2 -sha256 89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f libgpg-error-1.48.tar.bz2 +sha1 28668dc3f693dfd8fa6724c702559e45ab5b15c0 libgpg-error-1.49.tar.bz2 +sha256 8b79d54639dbf4abc08b5406fb2f37e669a2dec091dd024fb87dd367131c63a9 libgpg-error-1.49.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 3dd0ec94da..9f60b7bc84 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.48 +LIBGPG_ERROR_VERSION = 1.49 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From ca256b6d2c4aa0f1d04f99132f8948c0b09b43f2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 3 Jun 2024 19:33:03 +0200 Subject: [PATCH 31/49] package/dmidecode: bump to version 3.6 For change log, see: https://git.savannah.gnu.org/cgit/dmidecode.git/tree/NEWS?h=dmidecode-3-6 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- package/dmidecode/dmidecode.hash | 4 ++-- package/dmidecode/dmidecode.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index 654c4cc537..ab1f62be65 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,4 +1,4 @@ # Locally computed after checking pgp signature from: -# https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.5.tar.xz.sig -sha256 79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073 dmidecode-3.5.tar.xz +# https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.6.tar.xz.sig +sha256 e40c65f3ec3dafe31ad8349a4ef1a97122d38f65004ed66575e1a8d575dd8bae dmidecode-3.6.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index 353978daa9..550e29d624 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.5 +DMIDECODE_VERSION = 3.6 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ From c489ac4c1eca47d463d14b0cdb697f2692405b2e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Mon, 3 Jun 2024 20:57:50 +0200 Subject: [PATCH 32/49] package/open62541: bump to version 1.3.11 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/open62541/open62541.hash | 2 +- package/open62541/open62541.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/open62541/open62541.hash b/package/open62541/open62541.hash index 366a0894e3..be9ee77cc2 100644 --- a/package/open62541/open62541.hash +++ b/package/open62541/open62541.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c78e0d2b1cb1a22db0102ed7f439073bc22ff44c5e9d9175f1b8e644f7b21f44 open62541-v1.3.10-git4.tar.gz +sha256 34fbf37e7f8e159b0a187bf8b0663af0187161ba4c5015828590c919645d596a open62541-v1.3.11-git4.tar.gz sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 LICENSE diff --git a/package/open62541/open62541.mk b/package/open62541/open62541.mk index 1be44eb0b4..26c3cd5c2e 100644 --- a/package/open62541/open62541.mk +++ b/package/open62541/open62541.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPEN62541_VERSION = v1.3.10 +OPEN62541_VERSION = v1.3.11 OPEN62541_SITE_METHOD = git OPEN62541_SITE = https://github.com/open62541/open62541.git OPEN62541_GIT_SUBMODULES = YES From 54d48c8cad4e89c1428a0b9440116a01b0431fae Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sat, 1 Jun 2024 22:14:27 -0500 Subject: [PATCH 33/49] package/python3: miscellaneous fixups There is no longer a need to lie about having mercurial installed as of upstream 5c4b0d063a, so drop the ac_cv_prog_HAS_HG override. `PYTHON3_REMOVE_USELESS_FILES`, while not exactly useless, had been referencing stale files and not performing full cleanup: * the "m" ABI suffix was dropped in upstream 6c44fde3e0 (python 3.8) * the smtpd was dropped in upstream a797fba888 (python 3.1) * the wininst* binaries were dropped in upstream 0e2a0f72cc (python 3.10) These legacy references have now been dropped. The smtpd.py file is a bit quirky because despite having been removed upstream, Buildroot's patches to disable certain modules have been carrying it forward. This has been rectified. While here, rework the file removals to accomodate the ABI suffix change and to globally remove __pycache__ directories. It's important to note that Buildroot uses legacy pyc placements for sourceless distributions, meaning __pycache__ is not used at all [0]. When necessary, optimized pyc files will be generated into the correct paths in subsequent hooks. [0]: https://peps.python.org/pep-3147/#case-4-legacy-pyc-files-and-source-less-imports Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- .../0008-Add-an-option-to-disable-pydoc.patch | 16 ++++++----- ...009-Add-an-option-to-disable-lib2to3.patch | 27 ++++++++++--------- .../0017-Add-an-option-to-disable-IDLE.patch | 26 +++++++++--------- package/python3/python3.mk | 23 +++++----------- 4 files changed, 43 insertions(+), 49 deletions(-) diff --git a/package/python3/0008-Add-an-option-to-disable-pydoc.patch b/package/python3/0008-Add-an-option-to-disable-pydoc.patch index 3c678bef1c..ffb6a7796f 100644 --- a/package/python3/0008-Add-an-option-to-disable-pydoc.patch +++ b/package/python3/0008-Add-an-option-to-disable-pydoc.patch @@ -1,4 +1,4 @@ -From 77fcd90a1236d59d40aa32d3bc4bef4303eb4066 Mon Sep 17 00:00:00 2001 +From e6284624679a525440dc4bfddc1347f8add22fd8 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:07:56 -0800 Subject: [PATCH] Add an option to disable pydoc @@ -12,6 +12,8 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: fix scripts array to reflect upstream ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ @@ -19,7 +21,7 @@ Signed-off-by: Adam Duskett 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5a40b7c5484..e87bc1fcd32 100644 +index 5a40b7c548..e87bc1fcd3 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1877,7 +1877,9 @@ bininstall: commoninstall altbininstall @@ -52,7 +54,7 @@ index 5a40b7c5484..e87bc1fcd32 100644 libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index b4d7d2cca6a..d56d8f9d1c5 100644 +index b4d7d2cca6..d56d8f9d1c 100644 --- a/configure.ac +++ b/configure.ac @@ -4222,6 +4222,12 @@ AS_VAR_IF([posix_threads], [stub], [ @@ -69,7 +71,7 @@ index b4d7d2cca6a..d56d8f9d1c5 100644 AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/setup.py b/setup.py -index 53b066cb18b..d8647724650 100644 +index 53b066cb18..25e6f4fc26 100644 --- a/setup.py +++ b/setup.py @@ -1597,6 +1597,12 @@ class DummyProcess: @@ -77,8 +79,8 @@ index 53b066cb18b..d8647724650 100644 import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) + -+ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', -+ 'Lib/smtpd.py'] ++ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3'] ++ + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/pydoc3' ] + @@ -96,5 +98,5 @@ index 53b066cb18b..d8647724650 100644 # --install-platlib -- -2.44.0 +2.34.1 diff --git a/package/python3/0009-Add-an-option-to-disable-lib2to3.patch b/package/python3/0009-Add-an-option-to-disable-lib2to3.patch index 13cb273bf8..06f38e92b3 100644 --- a/package/python3/0009-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0009-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From 18e19402fab3939223a58481734e685d25c3102b Mon Sep 17 00:00:00 2001 +From 3fbd10c59a777c4ef7ee1bd3fb70808e25e11703 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -14,14 +14,16 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett [ Bernd Kuhls: ported to Python 3.11.4] Signed-off-by: Bernd Kuhls +[ Vincent Fazio: fix scripts array to reflect upstream ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 17 ++++++++++++----- configure.ac | 6 ++++++ - setup.py | 6 +++--- - 3 files changed, 21 insertions(+), 8 deletions(-) + setup.py | 4 +++- + 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e87bc1fcd32..1a0ab0de426 100644 +index e87bc1fcd3..1a0ab0de42 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1881,7 +1881,9 @@ ifeq (@PYDOC@,yes) @@ -82,7 +84,7 @@ index e87bc1fcd32..1a0ab0de426 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. diff --git a/configure.ac b/configure.ac -index d56d8f9d1c5..bf91fb2f824 100644 +index d56d8f9d1c..bf91fb2f82 100644 --- a/configure.ac +++ b/configure.ac @@ -7147,6 +7147,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu @@ -99,24 +101,23 @@ index d56d8f9d1c5..bf91fb2f824 100644 AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) diff --git a/setup.py b/setup.py -index d8647724650..e02591dae10 100644 +index 25e6f4fc26..78d880f9db 100644 --- a/setup.py +++ b/setup.py -@@ -1598,11 +1598,11 @@ class DummyProcess: +@@ -1598,10 +1598,12 @@ class DummyProcess: import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) -- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] +- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3'] ++ scripts = ['Tools/scripts/idle3'] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/pydoc3' ] -- + if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/2to3' ] + setup(# PyPI Metadata (PEP 301) name = "Python", - version = sys.version.split()[0], -- -2.44.0 +2.34.1 diff --git a/package/python3/0017-Add-an-option-to-disable-IDLE.patch b/package/python3/0017-Add-an-option-to-disable-IDLE.patch index f0af3f53f4..fe44ef0d05 100644 --- a/package/python3/0017-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0017-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From f74c580b9e5bd8c710627b48cea4e152426e71e6 Mon Sep 17 00:00:00 2001 +From dd4ac2662ae1feaa3a29c4088193e48645b080f7 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -11,14 +11,16 @@ Signed-off-by: Maxime Ripard Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Vincent Fazio: fixup setup array to reflect upstream ] +Signed-off-by: Vincent Fazio --- Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ - setup.py | 5 ++++- - 3 files changed, 16 insertions(+), 2 deletions(-) + setup.py | 4 +++- + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8e5f6762d20..4e407cbcfa9 100644 +index 8e5f6762d2..4e407cbcfa 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1875,7 +1875,9 @@ bininstall: commoninstall altbininstall @@ -51,7 +53,7 @@ index 8e5f6762d20..4e407cbcfa9 100644 libinstall: all $(srcdir)/Modules/xxmodule.c @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index cb7e980e5b5..fe497ec9dfb 100644 +index cb7e980e5b..fe497ec9df 100644 --- a/configure.ac +++ b/configure.ac @@ -7206,6 +7206,12 @@ AC_ARG_ENABLE(lib2to3, @@ -68,25 +70,25 @@ index cb7e980e5b5..fe497ec9dfb 100644 AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) diff --git a/setup.py b/setup.py -index e02591dae10..ada914c5501 100644 +index 78d880f9db..ca05faec97 100644 --- a/setup.py +++ b/setup.py -@@ -1598,11 +1598,14 @@ class DummyProcess: +@@ -1598,12 +1598,14 @@ class DummyProcess: import warnings warnings.filterwarnings("ignore",category=DeprecationWarning) -- scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] -+ scripts = [ 'Lib/smtpd.py'] +- scripts = ['Tools/scripts/idle3'] ++ scripts = [] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/pydoc3' ] if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): scripts += [ 'Tools/scripts/2to3' ] + if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/idle3' ] -+ + setup(# PyPI Metadata (PEP 301) name = "Python", - version = sys.version.split()[0], -- -2.44.0 +2.34.1 diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 5d9d77af50..6859fc2274 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -36,8 +36,7 @@ HOST_PYTHON3_CONF_OPTS += \ # Make python believe we don't have 'hg', so that it doesn't try to # communicate over the network during the build. HOST_PYTHON3_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ - ac_cv_prog_HAS_HG=/bin/false + LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" PYTHON3_DEPENDENCIES = host-python3 libffi @@ -156,14 +155,11 @@ else PYTHON3_CONF_OPTS += --disable-ossaudiodev endif -# Make python believe we don't have 'hg', so that it doesn't try to -# communicate over the network during the build. PYTHON3_CONF_ENV += \ ac_cv_have_long_long_format=yes \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes \ - ac_cv_prog_HAS_HG=/bin/false + ac_cv_working_tzset=yes # GCC is always compliant with IEEE754 ifeq ($(BR2_ENDIAN),"LITTLE") @@ -200,18 +196,11 @@ PYTHON3_CONF_OPTS += \ # define PYTHON3_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config - rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config rm -f $(TARGET_DIR)/usr/bin/python3-config - rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3 - rm -f $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/distutils/command/wininst*.exe - for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m-*/ \ - -type f -not -name Makefile` ; do \ - rm -f $$i ; \ - done - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/__pycache__/ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/lib-dynload/sysconfigdata/__pycache__ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/collections/__pycache__ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/importlib/__pycache__ + find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)-*/ \ + -type f -not -name Makefile -exec rm -rf {} \; + find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -type d \ + -name __pycache__ -exec rm -rf {} \; endef PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_USELESS_FILES From 545704bd52165c119c6d95c268a5726ea7a88b1a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Jun 2024 19:53:22 +0200 Subject: [PATCH 34/49] package/sunxi-mali-utgard-driver: handle patching the Buildroot way Signed-off-by: Yann E. MORIN Cc: Giulio Benetti Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- .../0001-build.sh-do-not-apply-patches.patch | 39 +++++++++++++++++++ .../sunxi-mali-utgard-driver.mk | 3 +- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch diff --git a/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch b/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch new file mode 100644 index 0000000000..02c6aa7884 --- /dev/null +++ b/package/sunxi-mali-utgard-driver/0001-build.sh-do-not-apply-patches.patch @@ -0,0 +1,39 @@ +From 079ed8aa57ba6629b992c3d0d01904d3e5170d3b Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Wed, 5 Jun 2024 13:06:16 +0200 +Subject: [PATCH] build.sh: do not apply patches + +In Buildroot, we handle applying the patches in a generic way, with +appropriate tools (e.g. with a proper tar). + +Upstream: not applicable +Signed-off-by: Yann E. MORIN +--- + build.sh | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/build.sh b/build.sh +index d1fedff..26efc53 100755 +--- a/build.sh ++++ b/build.sh +@@ -10,6 +10,8 @@ BUILD_OPTS="USING_UMP=0 + USING_DEVFREQ=1" + + apply_patches() { ++ return 0 # Patching handled by Buildroot ++ + pushd $2 + + quilt push -a +@@ -22,6 +24,8 @@ apply_patches() { + } + + unapply_patches() { ++ return 0 # Patching handled by Buildroot ++ + pushd $2 + + quilt pop -a +-- +2.45.1 + diff --git a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk index 72fade58ed..b8a12247d3 100644 --- a/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk +++ b/package/sunxi-mali-utgard-driver/sunxi-mali-utgard-driver.mk @@ -16,8 +16,7 @@ SUNXI_MALI_UTGARD_DRIVER_MAKE_OPTS = \ define SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES ln -sf $(SUNXI_MALI_UTGARD_REV)/series $(@D)/patches - $(SED) 's|quilt push -a|$(TOPDIR)/support/scripts/apply-patches.sh . ../patches|' \ - $(@D)/build.sh + $(APPLY_PATCHES) $(@D)/$(SUNXI_MALI_UTGARD_REV) $(@D)/patches endef SUNXI_MALI_UTGARD_DRIVER_POST_PATCH_HOOKS += SUNXI_MALI_UTGARD_DRIVER_USE_APPLY_PATCHES From 6614e2f9da2c916f4707dc476fb0d123a835fd3c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 13:00:20 +0100 Subject: [PATCH 35/49] configs/versal_vck190_defconfig: bump to xilinx-v2024.1 This patch bumps the versal_vck190_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PLM xilinx-v2024.1 - PSMFW xilinx-v2024.1 Removed ATF patches that were needed for ATF v2.8. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- ...-build-add-support-for-new-binutils-versions.patch | 1 - .../0002-build-tools-avoid-unnecessary-link.patch | 1 - configs/versal_vck190_defconfig | 11 +++++------ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 120000 board/versal/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch delete mode 120000 board/versal/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch diff --git a/board/versal/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch b/board/versal/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch deleted file mode 120000 index 8ad996914b..0000000000 --- a/board/versal/patches/arm-trusted-firmware/0001-feat-build-add-support-for-new-binutils-versions.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../boot/arm-trusted-firmware/v2.8/0001-feat-build-add-support-for-new-binutils-versions.patch \ No newline at end of file diff --git a/board/versal/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch b/board/versal/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch deleted file mode 120000 index fecdee5449..0000000000 --- a/board/versal/patches/arm-trusted-firmware/0002-build-tools-avoid-unnecessary-link.patch +++ /dev/null @@ -1 +0,0 @@ -../../../../boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch \ No newline at end of file diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 8561b6641a..ecfc10cc91 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -1,12 +1,12 @@ BR2_aarch64=y BR2_cortex_a72=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyAMA0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/versal-vck190-rev1.1" @@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="versal" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y @@ -24,7 +24,7 @@ BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -33,10 +33,9 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y -BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2023.2" +BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="xilinx_v2024.1" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190" BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_BOOTGEN=y -BR2_GLOBAL_PATCH_DIR="board/versal/patches" From 24b6340bac612802c4d96403c2d05d214d05fdfe Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 13:14:34 +0100 Subject: [PATCH 36/49] configs/zynqmp_kria_kv260_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_kria_kv260_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer needed. With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now the offset between the base address of the boot.bin and u-boot.itb instead of a raw base address of u-boot.itb. This allows for A/B firmware updates since the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. Thus, Kria SOMs come with the following QSPI address table. Partition A: 0x200000 - boot.bin 0x280000 - u-boot.itb Partition B: 0xF80000 - boot.bin 0x1000000 - u-boot.itb This patch updates the addressing in the readme.txt accordingly. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- board/zynqmp/kria/readme.txt | 4 ++-- configs/zynqmp_kria_kv260_defconfig | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index 96009804b3..c6be22133c 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -90,8 +90,8 @@ KV260 Flashing Instructions: Flashing u-boot.itb: $ sf probe $ fatload mmc 1 0x1000000 u-boot.itb - $ sf erase 0xf80000 +$filesize - $ sf write 0x1000000 0xf80000 $filesize + $ sf erase 0x280000 +$filesize + $ sf write 0x1000000 0x280000 $filesize Flashing boot.bin: $ sf probe diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index a3a157267c..7b402e032c 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kv260/kv260.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kv-g-revB" @@ -15,16 +15,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -32,11 +31,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kv260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kv260-kria/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kv260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 3137e5bf8f06343e60096ef9e89b1d0788fb6c0f Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 13:14:35 +0100 Subject: [PATCH 37/49] configs/zynqmp_kria_kr260_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_kria_kr260_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Migrated u-boot to xilinx_zynqmp_kria_defconfig, so uboot.fragment no longer needed. With u-boot 2024.1, CONFIG_SYS_SPI_U_BOOT_OFFS has a new meaning. It is now the offset between the base address of the boot.bin and u-boot.itb instead of a raw base address of u-boot.itb. This allows for A/B firmware updates since the u-boot.itb is set by default to a 0x80000 offset of the boot.bin. Thus, Kria SOMs come with the following QSPI address table. Partition A: 0x200000 - boot.bin 0x280000 - u-boot.itb Partition B: 0xF80000 - boot.bin 0x1000000 - u-boot.itb This patch updates the addressing in the readme.txt accordingly. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- board/zynqmp/kria/readme.txt | 4 ++-- configs/zynqmp_kria_kr260_defconfig | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/board/zynqmp/kria/readme.txt b/board/zynqmp/kria/readme.txt index c6be22133c..ca3164383a 100644 --- a/board/zynqmp/kria/readme.txt +++ b/board/zynqmp/kria/readme.txt @@ -103,8 +103,8 @@ KD240 / KR260 Flashing Instructions: Flashing u-boot.itb: $ sf probe $ fatload usb 0 0x1000000 u-boot.itb - $ sf erase 0xf80000 +$filesize - $ sf write 0x1000000 0xf80000 $filesize + $ sf erase 0x280000 +$filesize + $ sf write 0x1000000 0x280000 $filesize Flashing boot.bin: $ sf probe diff --git a/configs/zynqmp_kria_kr260_defconfig b/configs/zynqmp_kria_kr260_defconfig index 2089c3f355..3bf269ab6b 100644 --- a/configs/zynqmp_kria_kr260_defconfig +++ b/configs/zynqmp_kria_kr260_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh board/zynqmp/kria/kr260/kr260.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 sda2 ${UBOOT_DIR}" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-smk-k26-revA-sck-kr-g-revB" @@ -15,16 +15,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="ZYNQMP_CONSOLE=cadence1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" -BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/kria/uboot.fragment" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_kria" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-smk-k26-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -32,11 +31,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/kr260-kria/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/kr260-kria/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/kria/kr260/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 49fa6ebb71f89e3c9e13d12070bea41ccf6ed700 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 13:47:37 +0100 Subject: [PATCH 38/49] configs/zynq_*: move hashes This patch moves the linux and uboot hashes from 'board/zynq/patches' to 'board/xilinx/patches'. The reason for this is that all of the Xilinx boards including zynq, zynqmp and versal will be using the same linux and uboot repo. By putting the hashes in 'board/xilinx/patches', the same hashes can be shared amongst all of the Xilinx boards. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- board/{zynq => xilinx}/patches/linux-headers/linux-headers.hash | 0 board/{zynq => xilinx}/patches/linux/linux.hash | 0 board/{zynq => xilinx}/patches/uboot/uboot.hash | 0 configs/zynq_microzed_defconfig | 2 +- configs/zynq_zc702_defconfig | 2 +- configs/zynq_zc706_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename board/{zynq => xilinx}/patches/linux-headers/linux-headers.hash (100%) rename board/{zynq => xilinx}/patches/linux/linux.hash (100%) rename board/{zynq => xilinx}/patches/uboot/uboot.hash (100%) diff --git a/board/zynq/patches/linux-headers/linux-headers.hash b/board/xilinx/patches/linux-headers/linux-headers.hash similarity index 100% rename from board/zynq/patches/linux-headers/linux-headers.hash rename to board/xilinx/patches/linux-headers/linux-headers.hash diff --git a/board/zynq/patches/linux/linux.hash b/board/xilinx/patches/linux/linux.hash similarity index 100% rename from board/zynq/patches/linux/linux.hash rename to board/xilinx/patches/linux/linux.hash diff --git a/board/zynq/patches/uboot/uboot.hash b/board/xilinx/patches/uboot/uboot.hash similarity index 100% rename from board/zynq/patches/uboot/uboot.hash rename to board/xilinx/patches/uboot/uboot.hash diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index c6ca5a6244..f955a0c4ad 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynq/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index 9e37678d9b..75ebc2a3ba 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynq/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 9ccf23f6e1..ce539eefaf 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynq/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 95606caf5c..925faeac8e 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -3,7 +3,7 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y -BR2_GLOBAL_PATCH_DIR="board/zynq/patches" +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" From 1608313efff353b65d8f7b4606aa86a178938acc Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 6 Jun 2024 02:35:01 +0300 Subject: [PATCH 39/49] package/json-glib: add host build Signed-off-by: Jarkko Sakkinen [yann.morin.1998@free.fr: also disable doc and tests] Signed-off-by: Yann E. MORIN --- package/json-glib/json-glib.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/json-glib/json-glib.mk b/package/json-glib/json-glib.mk index cd53f24cee..e216af20b1 100644 --- a/package/json-glib/json-glib.mk +++ b/package/json-glib/json-glib.mk @@ -18,6 +18,15 @@ JSON_GLIB_DEPENDENCIES = \ host-pkgconf \ libglib2 +HOST_JSON_GLIB_DEPENDENCIES = \ + host-pkgconf \ + host-libglib2 + +HOST_JSON_GLIB_CONF_OPTS = \ + -Dgtk_doc=disabled \ + -Dtests=false \ + -Dintrospection=disabled + ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) JSON_GLIB_CONF_OPTS += -Dintrospection=enabled JSON_GLIB_DEPENDENCIES += gobject-introspection @@ -34,3 +43,4 @@ endif JSON_GLIB_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS) $(eval $(meson-package)) +$(eval $(host-meson-package)) From b2eec8c6265a38cdba1afadf7f60e0fd00f3b448 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 6 Jun 2024 02:35:02 +0300 Subject: [PATCH 40/49] package/libtpms: add host package Libtpms is a library that targets the integration of TPM functionality into hypervisors, primarily into Qemu. Libtpms provides a very narrow public API for this purpose so that integration is possible. Only the minimum of necessary APIs are made publicly available. Signed-off-by: Jarkko Sakkinen Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/libtpms/libtpms.hash | 2 ++ package/libtpms/libtpms.mk | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 package/libtpms/libtpms.hash create mode 100644 package/libtpms/libtpms.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9cfc84dd65..d314398248 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1517,6 +1517,7 @@ N: Jared Bents F: package/libvirt/ N: Jarkko Sakkinen +F: package/libtpms/ F: package/quota/ N: Jason Pruitt diff --git a/package/libtpms/libtpms.hash b/package/libtpms/libtpms.hash new file mode 100644 index 0000000000..1026aaa4f4 --- /dev/null +++ b/package/libtpms/libtpms.hash @@ -0,0 +1,2 @@ +sha256 2807466f1563ebe45fdd12dd26e501e8a0c4fbb99c7c428fbb508789efd221c0 libtpms-0.9.6.tar.gz +sha256 82f1e6bae374bb6a9d4f4596767fd33e499718d560de140fd9f3d402cc5e41fb LICENSE diff --git a/package/libtpms/libtpms.mk b/package/libtpms/libtpms.mk new file mode 100644 index 0000000000..19d7cef89f --- /dev/null +++ b/package/libtpms/libtpms.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# libtpms +# +################################################################################ + +LIBTPMS_VERSION = 0.9.6 +LIBTPMS_SITE = $(call github,stefanberger,libtpms,v$(LIBTPMS_VERSION)) +LIBTPMS_LICENSE = BSD-4-Clause +LIBTPMS_LICENSE_FILES = LICENSE +LIBTPMS_INSTALL_STAGING = YES + +# Required because a plain Git clone is used: +HOST_LIBTPMS_AUTORECONF = YES +HOST_LIBTPMS_DEPENDENCIES = host-pkgconf host-openssl +HOST_LIBTPMS_CONF_OPTS = --with-openssl -with-tpm2 + +$(eval $(host-autotools-package)) From 87b9b126d23be1e95b3d2b82438f65e28f554a87 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 6 Jun 2024 02:35:03 +0300 Subject: [PATCH 41/49] package/swtpm: add host package The SWTPM package provides TPM emulators with different front-end interfaces to libtpms. TPM emulators provide socket interfaces (TCP/IP and Unix) and the Linux CUSE interface for the creation of multiple native /dev/vtpm* devices. Signed-off-by: Jarkko Sakkinen [yann.morin.1998@free.fr: disable tests] Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/swtpm/Config.in.host | 11 +++++++++++ package/swtpm/swtpm.hash | 2 ++ package/swtpm/swtpm.mk | 28 ++++++++++++++++++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 package/swtpm/Config.in.host create mode 100644 package/swtpm/swtpm.hash create mode 100644 package/swtpm/swtpm.mk diff --git a/DEVELOPERS b/DEVELOPERS index d314398248..cf48e01037 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1519,6 +1519,7 @@ F: package/libvirt/ N: Jarkko Sakkinen F: package/libtpms/ F: package/quota/ +F: package/swtpm/ N: Jason Pruitt F: package/librtlsdr/ diff --git a/package/Config.in.host b/package/Config.in.host index eacce5e448..9cdca62633 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -107,6 +107,7 @@ menu "Host utilities" source "package/starfive-spltool/Config.in.host" source "package/sunxi-tools/Config.in.host" source "package/swig/Config.in.host" + source "package/swtpm/Config.in.host" source "package/swugenerator/Config.in.host" source "package/systemd/Config.in.host" source "package/tegrarcm/Config.in.host" diff --git a/package/swtpm/Config.in.host b/package/swtpm/Config.in.host new file mode 100644 index 0000000000..0dd984ff8d --- /dev/null +++ b/package/swtpm/Config.in.host @@ -0,0 +1,11 @@ +config BR2_PACKAGE_HOST_SWTPM + bool "host swtpm" + help + Compiles SWTPM software TPM emulator for the host. + + The SWTPM package provides TPM emulators with different + front-end interfaces to libtpms. TPM emulators provide socket + interfaces (TCP/IP and Unix) and the Linux CUSE interface for + the creation of multiple native /dev/vtpm* devices. + + https://github.com/stefanberger/swtpm/wiki diff --git a/package/swtpm/swtpm.hash b/package/swtpm/swtpm.hash new file mode 100644 index 0000000000..934d3b6ee0 --- /dev/null +++ b/package/swtpm/swtpm.hash @@ -0,0 +1,2 @@ +sha256 b281b4e8c39f68e1928675f788abc70072e4081152e129144359a8c5c304c06b swtpm-0.8.2.tar.gz +sha256 19d27d6e96d07022e5e688f75c974f1ceb9aae9e90e0fccae68666d02099cc4b LICENSE diff --git a/package/swtpm/swtpm.mk b/package/swtpm/swtpm.mk new file mode 100644 index 0000000000..598d56cf1d --- /dev/null +++ b/package/swtpm/swtpm.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# swtpm +# +################################################################################ + +SWTPM_VERSION = 0.8.2 +SWTPM_SITE = $(call github,stefanberger,swtpm,v$(SWTPM_VERSION)) +SWTPM_LICENSE = BSD-4-Clause +SWTPM_LICENSE_FILES = LICENSE + +HOST_SWTPM_DEPENDENCIES = \ + host-json-glib \ + host-libopenssl \ + host-libtasn1 \ + host-libtool \ + host-libtpms \ + host-pkgconf + +# Required because a plain Git clone is used: +HOST_SWTPM_AUTORECONF = YES + +HOST_SWTPM_CONF_OPTS = \ + --disable-tests \ + --with-openssl \ + --without-seccomp + +$(eval $(host-autotools-package)) From f820d41f0a7479bd43b72dcc4f70b978e5d0ed70 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 6 Jun 2024 13:34:57 +0200 Subject: [PATCH 42/49] package/delve: only select host-go when needed Commit 58a291470acf (package/pkg-golang: select BR2_PACKAGE_HOST_GO) ensured that we had the host-go enabled for all packages that need it. However, for delve, the select was added to the _ARCH_SUPPORTS symbol, which means that host-go is built as soon as delve supports the target, even when devle itself is not enabled. Move the select to the main symbol. Fixes: 58a291470acf458239202bd81bfc642b9cadd298 Signed-off-by: Yann E. MORIN --- package/delve/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/delve/Config.in b/package/delve/Config.in index 288dc1ea15..2ba70e8ceb 100644 --- a/package/delve/Config.in +++ b/package/delve/Config.in @@ -7,12 +7,12 @@ config BR2_PACKAGE_DELVE_ARCH_SUPPORTS default y if BR2_x86_64 depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS - select BR2_PACKAGE_HOST_GO config BR2_PACKAGE_DELVE bool "delve" depends on BR2_PACKAGE_DELVE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_HOST_GO help Delve is a debugger for the Go programming language. From 7c286c345cf42bc341a3f0502e33fc8477fdd904 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Thu, 6 Jun 2024 13:48:11 +0300 Subject: [PATCH 43/49] package/tpm2-tools: bump version to 5.7 tpm2_encodeobject is essential for testing RSAPKCS1 and ECDSA TPM2 signing keys, as the key blob is loaded to the chip in DER format defined by ASN.1 schema. Link: https://lore.kernel.org/linux-crypto/20240528210823.28798-1-jarkko@kernel.org/ Cc: Erik Larsson Cc: Thomas Petazzoni Signed-off-by: Jarkko Sakkinen [yann.morin.1998@free.fr: fix path of LICENSE file] Signed-off-by: Yann E. MORIN --- package/tpm2-tools/tpm2-tools.hash | 4 ++-- package/tpm2-tools/tpm2-tools.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tpm2-tools/tpm2-tools.hash b/package/tpm2-tools/tpm2-tools.hash index f50a896363..cb7e8085d6 100644 --- a/package/tpm2-tools/tpm2-tools.hash +++ b/package/tpm2-tools/tpm2-tools.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630 tpm2-tools-5.2.tar.gz -sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c doc/LICENSE +sha256 3810d36b5079256f4f2f7ce552e22213d43b1031c131538df8a2dbc3c570983a tpm2-tools-5.7.tar.gz +sha256 f6995d52c8b8e4d2c3bace7fc9c330a77a90d808166fbad4d7ead7e8ba2fc66c docs/LICENSE diff --git a/package/tpm2-tools/tpm2-tools.mk b/package/tpm2-tools/tpm2-tools.mk index 12f924eee5..cdb8931a3c 100644 --- a/package/tpm2-tools/tpm2-tools.mk +++ b/package/tpm2-tools/tpm2-tools.mk @@ -4,10 +4,10 @@ # ################################################################################ -TPM2_TOOLS_VERSION = 5.2 +TPM2_TOOLS_VERSION = 5.7 TPM2_TOOLS_SITE = https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION) TPM2_TOOLS_LICENSE = BSD-3-Clause -TPM2_TOOLS_LICENSE_FILES = doc/LICENSE +TPM2_TOOLS_LICENSE_FILES = docs/LICENSE TPM2_TOOLS_CPE_ID_VALID = YES TPM2_TOOLS_SELINUX_MODULES = tpm2 TPM2_TOOLS_DEPENDENCIES = libcurl openssl tpm2-tss host-pkgconf From c1554df688cb1563c8da2f8fcba21020dcf126a1 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 6 Jun 2024 13:07:56 +0100 Subject: [PATCH 44/49] configs/versal_vck190_defconfig: add hashes Signed-off-by: Brandon Maier Signed-off-by: Neal Frager Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ board/xilinx/patches/versal-firmware/versal-firmware.hash | 2 ++ configs/versal_vck190_defconfig | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 100644 board/xilinx/patches/versal-firmware/versal-firmware.hash diff --git a/.checkpackageignore b/.checkpackageignore index c3de61111f..eea412d01d 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -358,7 +358,6 @@ configs/ts4900_defconfig lib_defconfig.ForceCheckHash configs/ts5500_defconfig lib_defconfig.ForceCheckHash configs/ts7680_defconfig lib_defconfig.ForceCheckHash configs/uevm5432_defconfig lib_defconfig.ForceCheckHash -configs/versal_vck190_defconfig lib_defconfig.ForceCheckHash configs/visionfive_defconfig lib_defconfig.ForceCheckHash configs/wandboard_defconfig lib_defconfig.ForceCheckHash configs/warp7_defconfig lib_defconfig.ForceCheckHash diff --git a/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..e300398541 --- /dev/null +++ b/board/xilinx/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 c3369c89eab4e452bbc76c630e5dccb6c0ae588c0175b6c8549aa0241deb06ef xlnx_rebase_v2.10_2024.1.tar.gz diff --git a/board/xilinx/patches/versal-firmware/versal-firmware.hash b/board/xilinx/patches/versal-firmware/versal-firmware.hash new file mode 100644 index 0000000000..c4d745f22c --- /dev/null +++ b/board/xilinx/patches/versal-firmware/versal-firmware.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7abcba4e0e44e3a4adf9c1f971d918575226d7604dfd64a386baaa00c1c6c35f versal-firmware-xilinx_v2024.1.tar.gz diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index ecfc10cc91..69272e721c 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -39,3 +39,5 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_BOOTGEN=y +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/xilinx/patches" From d9a0954288c43c01633343a4a701692de8068cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 9 Feb 2024 21:44:39 +0100 Subject: [PATCH 45/49] configs: add raspberrypi 5 defconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This configuration builds an image for the RaspberryPi 5. Cc: Adam Duskett Cc: Yann E. MORIN Signed-off-by: Gaël PORTAY [yann.morin.1998@free.fr: check hashes] Signed-off-by: Yann E. MORIN --- board/raspberrypi/cmdline_5.txt | 1 + board/raspberrypi/config_5.txt | 14 ++++++ board/raspberrypi/linux-4k-page-size.fragment | 1 + board/raspberrypi/readme.txt | 6 +++ board/raspberrypi5 | 1 + configs/raspberrypi5_defconfig | 50 +++++++++++++++++++ 6 files changed, 73 insertions(+) create mode 100644 board/raspberrypi/cmdline_5.txt create mode 100644 board/raspberrypi/config_5.txt create mode 100644 board/raspberrypi/linux-4k-page-size.fragment create mode 120000 board/raspberrypi5 create mode 100644 configs/raspberrypi5_defconfig diff --git a/board/raspberrypi/cmdline_5.txt b/board/raspberrypi/cmdline_5.txt new file mode 100644 index 0000000000..ac457353e2 --- /dev/null +++ b/board/raspberrypi/cmdline_5.txt @@ -0,0 +1 @@ +root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA10,115200 diff --git a/board/raspberrypi/config_5.txt b/board/raspberrypi/config_5.txt new file mode 100644 index 0000000000..bbed19fe46 --- /dev/null +++ b/board/raspberrypi/config_5.txt @@ -0,0 +1,14 @@ +# Please note that this is only a sample, we recommend you to change it to fit +# your needs. +# You should override this file using BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE. +# See http://buildroot.org/manual.html#rootfs-custom +# and http://elinux.org/RPiconfig for a description of config.txt syntax + +kernel=Image + +# To use an external initramfs file +#initramfs rootfs.cpio.gz + +# Disable overscan assuming the display supports displaying the full resolution +# If the text shown on the screen disappears off the edge, comment this out +disable_overscan=1 diff --git a/board/raspberrypi/linux-4k-page-size.fragment b/board/raspberrypi/linux-4k-page-size.fragment new file mode 100644 index 0000000000..5df91df1aa --- /dev/null +++ b/board/raspberrypi/linux-4k-page-size.fragment @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/board/raspberrypi/readme.txt b/board/raspberrypi/readme.txt index 9202b5ff37..aa6421ea01 100644 --- a/board/raspberrypi/readme.txt +++ b/board/raspberrypi/readme.txt @@ -10,6 +10,7 @@ These instructions apply to all models of the Raspberry Pi: - the model B3 (aka Raspberry Pi 3). - the model B4 (aka Raspberry Pi 4). - the model CM4 (aka Raspberry Pi Compute Module 4 and IO Board). + - the model B5 (aka Raspberry Pi 5). How to build it =============== @@ -64,6 +65,10 @@ or for CM4 (on IO Board - 64 bit): $ make raspberrypicm4io_64_defconfig +For model 5 B: + + $ make raspberrypi5_defconfig + Build the rootfs ---------------- @@ -94,6 +99,7 @@ After building, you should obtain this tree: +-- bcm2710-rpi-cm3.dtb [1] +-- bcm2711-rpi-4-b.dtb [1] +-- bcm2711-rpi-cm4.dtb [1] + +-- bcm2712-rpi-5-b.dtb [1] +-- bcm2837-rpi-3-b.dtb [1] +-- boot.vfat +-- rootfs.ext4 diff --git a/board/raspberrypi5 b/board/raspberrypi5 new file mode 120000 index 0000000000..fcdafc81ed --- /dev/null +++ b/board/raspberrypi5 @@ -0,0 +1 @@ +raspberrypi \ No newline at end of file diff --git a/configs/raspberrypi5_defconfig b/configs/raspberrypi5_defconfig new file mode 100644 index 0000000000..73592c4a1a --- /dev/null +++ b/configs/raspberrypi5_defconfig @@ -0,0 +1,50 @@ +BR2_aarch64=y +BR2_cortex_a76_a55=y +BR2_ARM_FPU_VFPV4=y + +BR2_TOOLCHAIN_BUILDROOT_CXX=y + +BR2_SYSTEM_DHCP="eth0" + +# Linux headers same as kernel, a 6.1 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y + +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/raspberrypi/linux-4k-page-size.fragment" +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,17f135b742c4edb340afb365873c3a574f7e16cb)/linux-17f135b742c4edb340afb365873c3a574f7e16cb.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="bcm2712" + +# Build the DTB from the kernel sources +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2712-rpi-5-b" + +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + +BR2_PACKAGE_RPI_FIRMWARE=y +BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="board/raspberrypi5/config_5.txt" +BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="board/raspberrypi5/cmdline_5.txt" +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set + +# Required tools to create the SD image +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y + +# Filesystem / image +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi5/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi5/post-image.sh" + +# Enable compressed kernel module support +BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y +BR2_PACKAGE_KMOD_TOOLS=y +BR2_PACKAGE_XZ=y +BR2_PACKAGE_KMOD=y +BR2_PACKAGE_HOST_KMOD_XZ=y + +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y +BR2_GLOBAL_PATCH_DIR="board/raspberrypi5/patches" From 8e2f5c106f0774cc7b02d4853f9a4c46ebcb3c19 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 12:52:10 +0100 Subject: [PATCH 46/49] configs/zynqmp_zcu102_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_zcu102_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- configs/zynqmp_zcu102_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index c920093d8d..f40002f6d9 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu102-rev1.0" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,11 +30,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu102-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu102-zynqmp/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu102/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From c0ec5438d96cb10e6dfce409c8007c18c0f9349c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 12:52:11 +0100 Subject: [PATCH 47/49] configs/zynqmp_zcu104_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_zcu104_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- configs/zynqmp_zcu104_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/zynqmp_zcu104_defconfig b/configs/zynqmp_zcu104_defconfig index 452f2343c8..ef9c9bad49 100644 --- a/configs/zynqmp_zcu104_defconfig +++ b/configs/zynqmp_zcu104_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu104-revC" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu104-revC" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,11 +30,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu104-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu104-zynqmp/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu104/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 089943812eb8dcbd308f3a3dea02d482bf9189df Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 3 Jun 2024 12:52:12 +0100 Subject: [PATCH 48/49] configs/zynqmp_zcu106_defconfig: bump to xilinx-v2024.1 This patch bumps the zynqmp_zcu106_defconfig to xilinx-v2024.1 which includes the following updates: - Linux v6.6.10 - U-Boot v2024.01 - ATF v2.10 - PMUFW xilinx-v2024.1 Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Yann E. MORIN --- configs/zynqmp_zcu106_defconfig | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 011c7f0fae..07c595436f 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -1,11 +1,11 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS0,115200 mmcblk0p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.6_LTS_2024.1)/xlnx_rebase_v6.6_LTS_2024.1.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/zynqmp-zcu106-revA" @@ -15,13 +15,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.8_2023.2)/xlnx_rebase_v2.8_2023.2.tar.gz" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,arm-trusted-firmware,xlnx_rebase_v2.10_2024.1)/xlnx_rebase_v2.10_2024.1.tar.gz" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="zynqmp" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2023.01_2023.2)/xlnx_rebase_v2023.01_2023.2.tar.gz" +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2024.01_2024.1)/xlnx_rebase_v2024.01_2024.1.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA" BR2_TARGET_UBOOT_NEEDS_DTC=y @@ -30,11 +30,10 @@ BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin" BR2_TARGET_UBOOT_ZYNQMP=y -BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2023.2/zcu106-zynqmp/pmufw.elf" +BR2_TARGET_UBOOT_ZYNQMP_PMUFW="https://github.com/Xilinx/soc-prebuilt-firmware/raw/xilinx_v2024.1/zcu106-zynqmp/pmufw.elf" BR2_TARGET_UBOOT_ZYNQMP_PM_CFG="board/zynqmp/zcu106/pm_cfg_obj.c" BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_GLOBAL_PATCH_DIR="board/zynqmp/patches" From 035651209f4a975cb5413b3911f5598db73e4822 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sat, 8 Jun 2024 22:25:09 -0500 Subject: [PATCH 49/49] package/python3: fix config directory pattern If a platform triplet is not detected during the configure stage, the config directory (LIBPL) defaults to `config-$VERSION`. In this scenario, the `PYTHON3_REMOVE_USELESS_FILES` hook would fail due to `find` incorrectly expecting a second dash and then the triplet. Now, we glob anything after the version which will match in both cases. Fixes: 54d48c8cad ("package/python3: miscellaneous fixups") Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN --- package/python3/python3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 6859fc2274..86fa3b970d 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -197,7 +197,7 @@ PYTHON3_CONF_OPTS += \ define PYTHON3_REMOVE_USELESS_FILES rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config rm -f $(TARGET_DIR)/usr/bin/python3-config - find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)-*/ \ + find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)*/ \ -type f -not -name Makefile -exec rm -rf {} \; find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -type d \ -name __pycache__ -exec rm -rf {} \;