From 7428907828c7715c7f95303068a0dd8db2770c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Mon, 16 Mar 2026 18:02:45 +0100 Subject: [PATCH] support/testing: bump test_atf u-boot to fix the build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python setuptools has removed the obsolete pkg_resources python module in v82.0.0. This module is used by the binman command in U-Boot until v2025.10. Since the python-setuptools package has been updated to v82.0.0 in Buildroot, the python test tests.boot.test_atf.TestATFAllwinner (using U-Boot v2023.10 and binman) fails to build with the following error [1]: ModuleNotFoundError: No module named 'pkg_resources' Update test_atf to use a more recent U-Boot v2026.01 (and add the dependency on GNU TLS), to fix the build. Link: https://gitlab.com/buildroot.org/buildroot/-/jobs/13500946337 [1] Fixes: 51365ff06379 ("package/python-setuptools: bump to version 82.0.0") Signed-off-by: Vincent Stehlé Cc: James Hilliard Cc: Julien Olivain Signed-off-by: Julien Olivain --- support/testing/tests/boot/test_atf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py index b822b9d357..02d0c74b84 100644 --- a/support/testing/tests/boot/test_atf.py +++ b/support/testing/tests/boot/test_atf.py @@ -16,13 +16,14 @@ class TestATFAllwinner(infra.basetest.BRTest): BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y - BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" + BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y + BR2_TARGET_UBOOT_NEEDS_GNUTLS=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"