CVS commit: pkgsrc/sysutils/u-boot

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Mon Dec 18 20:11:30 UTC 2023

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

Log Message:
u-boot: fix pine-h64 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.1 -r1.2 pkgsrc/sysutils/u-boot/distinfo-2021.01
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches-2021.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-2021.01
diff -u pkgsrc/sysutils/u-boot/distinfo-2021.01:1.1 pkgsrc/sysutils/u-boot/distinfo-2021.01:1.2
--- pkgsrc/sysutils/u-boot/distinfo-2021.01:1.1 Tue Mar  9 16:49:12 2021
+++ pkgsrc/sysutils/u-boot/distinfo-2021.01     Mon Dec 18 20:11:30 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo-2021.01,v 1.1 2021/03/09 16:49:12 martin Exp $
+$NetBSD: distinfo-2021.01,v 1.2 2023/12/18 20:11:30 gutteridge Exp $
 
 SHA1 (u-boot-2021.01.tar.bz2) = af6228e71419c29bb0192631bc8868e211941f9d
 RMD160 (u-boot-2021.01.tar.bz2) = 2a2e5906f9ea5947025e948bd34acb03488e87de
 SHA512 (u-boot-2021.01.tar.bz2) = 40dd4d9ef87a1829158658c433d46a047a39c0d8c314ad8d133f7240343ee3a75b060f009dd2efe598cfb8a766773f6cd773ea7f7745ee88e52a771c77eb1c6e
 Size (u-boot-2021.01.tar.bz2) = 16375990 bytes
+SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = a1c1ea0d244ca4e5a1e6422b66fc5a30f435f4be

Added files:

Index: pkgsrc/sysutils/u-boot/patches-2021.01/patch-scripts_dtc_pylibfdt_Makefile
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2021.01/patch-scripts_dtc_pylibfdt_Makefile:1.1
--- /dev/null   Mon Dec 18 20:11:30 2023
+++ pkgsrc/sysutils/u-boot/patches-2021.01/patch-scripts_dtc_pylibfdt_Makefile  Mon Dec 18 20:11:30 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-scripts_dtc_pylibfdt_Makefile,v 1.1 2023/12/18 20:11:30 gutteridge Exp $
+
+Fix build with py-setuptools >= 69.0, which strictly enforces PEP 440
+versioning.
+
+--- scripts/dtc/pylibfdt/Makefile.orig 2021-01-11 13:11:43.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)/.." \