Mon Dec 18 17:11:31 2023 UTC (160d)
u-boot: fix nanopi-r2s and rock64 builds

As of py-setuptools 69.0, PEP 440 versioning is strictly enforced, so
builds that invoked pylibfdt were failing with a version string that
included "u-boot-" in it.


(gutteridge)
diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot/distinfo-2022.01
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches-2022.01/patch-scripts_dtc_pylibfdt_Makefile
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/u-boot/distinfo-2022.01 (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/distinfo-2022.01 2023/08/27 23:38:07 1.4
+++ pkgsrc/sysutils/u-boot/distinfo-2022.01 2023/12/18 17:11:31 1.5
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo-2022.01,v 1.4 2023/08/27 23:38:07 gutteridge Exp $ 1$NetBSD: distinfo-2022.01,v 1.5 2023/12/18 17:11:31 gutteridge Exp $
2 2
3BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329 3BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329
4SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825 4SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
5Size (u-boot-2022.01.tar.bz2) = 17449627 bytes 5Size (u-boot-2022.01.tar.bz2) = 17449627 bytes
6SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab 6SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab
7SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490 7SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490
8SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf 8SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf
9SHA1 (patch-configs_nanopi-r2s-rk3328_defconfig) = 1f75f77420919e834bbf32fc8ef2ac20f0757f2b 9SHA1 (patch-configs_nanopi-r2s-rk3328_defconfig) = 1f75f77420919e834bbf32fc8ef2ac20f0757f2b
10SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = dceca39a9574e3491f835232b398c739d35e5e95 10SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = dceca39a9574e3491f835232b398c739d35e5e95
11SHA1 (patch-configs_rock64-rk3328_defconfig) = 44c0131d36fbc0bad769104ce07bdab9ae605bbd 11SHA1 (patch-configs_rock64-rk3328_defconfig) = 44c0131d36fbc0bad769104ce07bdab9ae605bbd
12SHA1 (patch-configs_rockpro64-rk3399_defconfig) = d42aba165cb4aca635e514177f43bffacfa8ace5 12SHA1 (patch-configs_rockpro64-rk3399_defconfig) = d42aba165cb4aca635e514177f43bffacfa8ace5
13SHA1 (patch-drivers_pci_pcie__rockchip.c) = 5ead0933261b2cef81cd317df478e47ecc0382d4 13SHA1 (patch-drivers_pci_pcie__rockchip.c) = 5ead0933261b2cef81cd317df478e47ecc0382d4
14SHA1 (patch-drivers_usb_host_usb-uclass.c) = 754504a9dc08f888a4ef09f5ccc3cb56b5ce297a 14SHA1 (patch-drivers_usb_host_usb-uclass.c) = 754504a9dc08f888a4ef09f5ccc3cb56b5ce297a
15SHA1 (patch-include_config_distro_bootcmd.h) = d37da930903d9d80829ac3cd0da98334057b6188 15SHA1 (patch-include_config_distro_bootcmd.h) = d37da930903d9d80829ac3cd0da98334057b6188
16SHA1 (patch-include_configs_rockchip-common.h) = d9aa111ec38f2f8ad64c45d42d3bc5519e27382d 16SHA1 (patch-include_configs_rockchip-common.h) = d9aa111ec38f2f8ad64c45d42d3bc5519e27382d
17SHA1 (patch-include_configs_rockpro64_rk3399.h) = 7efd0b09cbf627dc59d2a23a76dd6506c9efc4c9 17SHA1 (patch-include_configs_rockpro64_rk3399.h) = 7efd0b09cbf627dc59d2a23a76dd6506c9efc4c9
 18SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = fc3fb6c2aa6ad8e71aecb30839c9e474adcf5229
File Added: pkgsrc/sysutils/u-boot/patches-2022.01/patch-scripts_dtc_pylibfdt_Makefile
$NetBSD: patch-scripts_dtc_pylibfdt_Makefile,v 1.1 2023/12/18 17:11:31 gutteridge Exp $

Fix build with py-setuptools >= 69.0, which strictly enforces PEP 440
versioning.

--- scripts/dtc/pylibfdt/Makefile.orig	2022-01-10 13:46:34.000000000 -0500
+++ scripts/dtc/pylibfdt/Makefile
@@ -17,7 +17,7 @@
       cmd_pymod = unset CROSS_COMPILE; unset CFLAGS; \
 		CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \
 		LDFLAGS="$(HOSTLDFLAGS)" \
-		VERSION="u-boot-$(UBOOTVERSION)" \
+		VERSION="$(UBOOTVERSION)" \
 		CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
 		SOURCES="$(PYLIBFDT_srcs)" \
 		SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \