CVS commit: pkgsrc/sysutils

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb 19 09:55:01 UTC 2026

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo-2024.10
        pkgsrc/sysutils/u-boot-visionfive2: Makefile
Added Files:
        pkgsrc/sysutils/u-boot/patches-2024.10: patch-tools_binman_control.py
Removed Files:
        pkgsrc/sysutils/u-boot-visionfive2/patches:
            patch-tools_binman_control.py

Log Message:
u-boot*: move patch to proper location


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot/distinfo-2024.10
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/u-boot-visionfive2/Makefile
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/u-boot-visionfive2/patches/patch-tools_binman_control.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches-2024.10/patch-tools_binman_control.py

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-2024.10
diff -u pkgsrc/sysutils/u-boot/distinfo-2024.10:1.1 pkgsrc/sysutils/u-boot/distinfo-2024.10:1.2
--- pkgsrc/sysutils/u-boot/distinfo-2024.10:1.1 Thu Jan  2 20:15:48 2025
+++ pkgsrc/sysutils/u-boot/distinfo-2024.10     Thu Feb 19 09:55:00 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo-2024.10,v 1.1 2025/01/02 20:15:48 rjs Exp $
+$NetBSD: distinfo-2024.10,v 1.2 2026/02/19 09:55:00 wiz Exp $
 
 BLAKE2s (u-boot-2024.10.tar.bz2) = dfec4437e3f21cbd97b0336ce035bc8456da74733e773b8bd32f9c0d8520f147
 SHA512 (u-boot-2024.10.tar.bz2) = ef817c9b5ae8dc6cd9e3f57811e90acc6a4d4394f0356aa5923e3e3c8559168f977bd5bf82824cd3650aa8e5e3c3d1b00e20818d21368151748682f1fc51152c
 Size (u-boot-2024.10.tar.bz2) = 26398495 bytes
+SHA1 (patch-tools_binman_control.py) = 3f10a04765df27bb1b2f8fe5ff395810c0300753

Index: pkgsrc/sysutils/u-boot-visionfive2/Makefile
diff -u pkgsrc/sysutils/u-boot-visionfive2/Makefile:1.7 pkgsrc/sysutils/u-boot-visionfive2/Makefile:1.8
--- pkgsrc/sysutils/u-boot-visionfive2/Makefile:1.7     Fri Feb  6 10:05:59 2026
+++ pkgsrc/sysutils/u-boot-visionfive2/Makefile Thu Feb 19 09:55:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2026/02/06 10:05:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2026/02/19 09:55:00 wiz Exp $
 
 UBOOT_TARGET=          visionfive2
 UBOOT_VERSION=         2024.10
@@ -11,7 +11,6 @@ post-extract:
 
 MAKE_ENV+=     OPENSBI=${WRKSRC}/fw_dynamic.bin
 
-PATCHDIR=      ${.CURDIR}/patches  # Presently, no patching is intended.
 .include "../../sysutils/u-boot/u-boot-riscv64.mk"
 BUILDLINK_DEPMETHOD.libuuid=   build
 .include "../../devel/libuuid/buildlink3.mk"

Added files:

Index: pkgsrc/sysutils/u-boot/patches-2024.10/patch-tools_binman_control.py
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2024.10/patch-tools_binman_control.py:1.1
--- /dev/null   Thu Feb 19 09:55:01 2026
+++ pkgsrc/sysutils/u-boot/patches-2024.10/patch-tools_binman_control.py        Thu Feb 19 09:55:00 2026
@@ -0,0 +1,55 @@
+$NetBSD: patch-tools_binman_control.py,v 1.1 2026/02/19 09:55:00 wiz Exp $
+
+adapted from
+commit 538719cb6a77934d069e0e64f264457a59a9ebfc
+Author: Yannic Moog <y.moog%phytec.de@localhost>
+Date:   Tue Jul 1 07:45:37 2025 +0200
+
+    binman: migrate from pkg_resources to importlib
+
+--- tools/binman/control.py.orig       2024-10-07 14:54:35.000000000 +0000
++++ tools/binman/control.py
+@@ -8,12 +8,11 @@ try:
+ from collections import OrderedDict
+ import glob
+ try:
+-    import importlib.resources
++    import importlib.resources as importlib_resources
+ except ImportError:  # pragma: no cover
+     # for Python 3.6
+     import importlib_resources
+ import os
+-import pkg_resources
+ import re
+ 
+ import sys
+@@ -96,7 +95,7 @@ def _ReadMissingBlobHelp():
+             msg = ''
+         return tag, msg
+ 
+-    my_data = pkg_resources.resource_string(__name__, 'missing-blob-help')
++    my_data = importlib_resources.files(__package__).joinpath('missing-blob-help').read_bytes()
+     re_tag = re.compile('^([-a-z0-9]+):$')
+     result = {}
+     tag = None
+@@ -151,8 +150,9 @@ def GetEntryModules(include_testing=True):
+     Returns:
+         Set of paths to entry class filenames
+     """
+-    glob_list = pkg_resources.resource_listdir(__name__, 'etype')
+-    glob_list = [fname for fname in glob_list if fname.endswith('.py')]
++    entries = importlib_resources.files(__package__).joinpath('etype')
++    glob_list = [entry.name for entry in entries.iterdir()
++                 if entry.name.endswith('.py') and entry.is_file()]
+     return set([os.path.splitext(os.path.basename(item))[0]
+                 for item in glob_list
+                 if include_testing or '_testing' not in item])
+@@ -752,7 +752,7 @@ def Binman(args):
+     global state
+ 
+     if args.full_help:
+-        with importlib.resources.path('binman', 'README.rst') as readme:
++        with importlib_resources.path('binman', 'README.rst') as readme:
+             tools.print_full_help(str(readme))
+         return 0
+