CVS commit: pkgsrc/sysutils/u-boot

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

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

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

Log Message:
u-boot*: fix build with setuptools 82


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot/distinfo-2022.04
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches-2022.04/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-2022.04
diff -u pkgsrc/sysutils/u-boot/distinfo-2022.04:1.2 pkgsrc/sysutils/u-boot/distinfo-2022.04:1.3
--- pkgsrc/sysutils/u-boot/distinfo-2022.04:1.2 Mon Dec 18 21:57:35 2023
+++ pkgsrc/sysutils/u-boot/distinfo-2022.04     Thu Feb 19 09:37:45 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo-2022.04,v 1.2 2023/12/18 21:57:35 gutteridge Exp $
+$NetBSD: distinfo-2022.04,v 1.3 2026/02/19 09:37:45 wiz Exp $
 
 BLAKE2s (u-boot-2022.04.tar.bz2) = f30bb94e07143168fc352e2840e4c8517716b90dfbedb196cc26c4d2c4e5b88a
 SHA512 (u-boot-2022.04.tar.bz2) = 113056e542db049eea3b1d1ccbbe52c79539a2f9bb6129d284ec9200dcffec7bd5969821913a9899631575b80991c84ad01bc845b4bba614e42e54466d9f0d64
 Size (u-boot-2022.04.tar.bz2) = 17772787 bytes
 SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = fc3fb6c2aa6ad8e71aecb30839c9e474adcf5229
+SHA1 (patch-tools_binman_control.py) = b5b8fabd359257d5301606140d51f9b592160407

Added files:

Index: pkgsrc/sysutils/u-boot/patches-2022.04/patch-tools_binman_control.py
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2022.04/patch-tools_binman_control.py:1.1
--- /dev/null   Thu Feb 19 09:37:45 2026
+++ pkgsrc/sysutils/u-boot/patches-2022.04/patch-tools_binman_control.py        Thu Feb 19 09:37:45 2026
@@ -0,0 +1,54 @@
+$NetBSD: patch-tools_binman_control.py,v 1.1 2026/02/19 09:37:45 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       2022-04-04 14:31:32.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
+@@ -82,7 +82,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
+@@ -129,8 +129,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])
+@@ -618,9 +619,8 @@ def Binman(args):
+     global state
+ 
+     if args.full_help:
+-        tools.print_full_help(
+-            os.path.join(os.path.dirname(os.path.realpath(sys.argv[0])), 'README.rst')
+-        )
++        with importlib_resources.path('binman', 'README.rst') as readme:
++            tools.print_full_help(str(readme))
+         return 0
+ 
+     # Put these here so that we can import this module without libfdt