CVS commit: pkgsrc/sysutils/u-boot

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Jun 17 13:44:26 UTC 2026

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

Log Message:
u-boot: fix binman tool for 2022.01 with py-setuptools > 80

Address u-boot-imx8mq-phanbell build failures.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/u-boot/distinfo-2022.01
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches-2022.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-2022.01
diff -u pkgsrc/sysutils/u-boot/distinfo-2022.01:1.8 pkgsrc/sysutils/u-boot/distinfo-2022.01:1.9
--- pkgsrc/sysutils/u-boot/distinfo-2022.01:1.8 Mon Jun  1 08:56:16 2026
+++ pkgsrc/sysutils/u-boot/distinfo-2022.01     Wed Jun 17 13:44:25 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo-2022.01,v 1.8 2026/06/01 08:56:16 rxg Exp $
+$NetBSD: distinfo-2022.01,v 1.9 2026/06/17 13:44:25 gutteridge Exp $
 
 BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329
 SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
@@ -20,3 +20,4 @@ SHA1 (patch-include_configs_imx8mq__phan
 SHA1 (patch-include_configs_rockchip-common.h) = d9aa111ec38f2f8ad64c45d42d3bc5519e27382d
 SHA1 (patch-include_configs_rockpro64_rk3399.h) = 7efd0b09cbf627dc59d2a23a76dd6506c9efc4c9
 SHA1 (patch-scripts_dtc_pylibfdt_Makefile) = fc3fb6c2aa6ad8e71aecb30839c9e474adcf5229
+SHA1 (patch-tools_binman_control.py) = b662e9551fdbd78161b5ac32df7fe466861cfee5

Added files:

Index: pkgsrc/sysutils/u-boot/patches-2022.01/patch-tools_binman_control.py
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2022.01/patch-tools_binman_control.py:1.1
--- /dev/null   Wed Jun 17 13:44:26 2026
+++ pkgsrc/sysutils/u-boot/patches-2022.01/patch-tools_binman_control.py        Wed Jun 17 13:44:26 2026
@@ -0,0 +1,42 @@
+$NetBSD: patch-tools_binman_control.py,v 1.1 2026/06/17 13:44:26 gutteridge 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-01-10 13:46:34.000000000 -0500
++++ tools/binman/control.py
+@@ -7,8 +7,8 @@
+ 
+ from collections import OrderedDict
+ import glob
++import importlib.resources as importlib_resources
+ import os
+-import pkg_resources
+ import re
+ 
+ import sys
+@@ -81,7 +81,7 @@
+             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
+@@ -128,8 +128,9 @@
+     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])