CVS commit: pkgsrc/sysutils/u-boot

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Dec 18 17:11:31 UTC 2023

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo-2022.01
Added Files:
        pkgsrc/sysutils/u-boot/patches-2022.01:
            patch-scripts_dtc_pylibfdt_Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/u-boot/distinfo-2022.01
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches-2022.01/patch-scripts_dtc_pylibfdt_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot/distinfo-2022.01
diff -u pkgsrc/sysutils/u-boot/distinfo-2022.01:1.4 pkgsrc/sysutils/u-boot/distinfo-2022.01:1.5
--- pkgsrc/sysutils/u-boot/distinfo-2022.01:1.4 Sun Aug 27 23:38:07 2023
+++ pkgsrc/sysutils/u-boot/distinfo-2022.01     Mon Dec 18 17:11:31 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo-2022.01,v 1.4 2023/08/27 23:38:07 gutteridge Exp $
+$NetBSD: distinfo-2022.01,v 1.5 2023/12/18 17:11:31 gutteridge Exp $
 
 BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329
 SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
@@ -15,3 +15,4 @@ SHA1 (patch-drivers_usb_host_usb-uclass.
 SHA1 (patch-include_config_distro_bootcmd.h) = d37da930903d9d80829ac3cd0da98334057b6188
 SHA1 (patch-include_configs_rockchip-common.h) = d9aa111ec38f2f8ad64c45d42d3bc5519e27382d
 SHA1 (patch-include_configs_rockpro64_rk3399.h) = 7efd0b09cbf627dc59d2a23a76dd6506c9efc4c9
+SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = fc3fb6c2aa6ad8e71aecb30839c9e474adcf5229

Added files:

Index: pkgsrc/sysutils/u-boot/patches-2022.01/patch-scripts_dtc_pylibfdt_Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2022.01/patch-scripts_dtc_pylibfdt_Makefile:1.1
--- /dev/null   Mon Dec 18 17:11:31 2023
+++ pkgsrc/sysutils/u-boot/patches-2022.01/patch-scripts_dtc_pylibfdt_Makefile  Mon Dec 18 17:11:31 2023
@@ -0,0 +1,16 @@
+$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)/.." \