CVS commit: pkgsrc/sysutils/u-boot

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Feb 19 09:45:11 UTC 2026

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo-2021.01
Added Files:
        pkgsrc/sysutils/u-boot/patches-2021.01: patch-tools_binman_control.py

Log Message:
u-boot*: fix more setptools 82


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot/distinfo-2021.01
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches-2021.01/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-2021.01
diff -u pkgsrc/sysutils/u-boot/distinfo-2021.01:1.2 pkgsrc/sysutils/u-boot/distinfo-2021.01:1.3
--- pkgsrc/sysutils/u-boot/distinfo-2021.01:1.2 Mon Dec 18 20:11:30 2023
+++ pkgsrc/sysutils/u-boot/distinfo-2021.01     Thu Feb 19 09:45:10 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo-2021.01,v 1.2 2023/12/18 20:11:30 gutteridge Exp $
+$NetBSD: distinfo-2021.01,v 1.3 2026/02/19 09:45:10 wiz 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
+SHA1 (patch-tools_binman_control.py) = c30dc2455f55e6df1ae4eceb09d7e300969e8dd3

Added files:

Index: pkgsrc/sysutils/u-boot/patches-2021.01/patch-tools_binman_control.py
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2021.01/patch-tools_binman_control.py:1.1
--- /dev/null   Thu Feb 19 09:45:11 2026
+++ pkgsrc/sysutils/u-boot/patches-2021.01/patch-tools_binman_control.py        Thu Feb 19 09:45:11 2026
@@ -0,0 +1,42 @@
+$NetBSD: patch-tools_binman_control.py,v 1.1 2026/02/19 09:45:11 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       2021-01-11 18:11:43.000000000 +0000
++++ tools/binman/control.py
+@@ -7,8 +7,8 @@ import glob
+ 
+ from collections import OrderedDict
+ import glob
++import importlib.resources as importlib_resources
+ import os
+-import pkg_resources
+ import re
+ 
+ import sys
+@@ -79,7 +79,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
+@@ -126,8 +126,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])