From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 30 Jul 2025 23:04:33 +0000 (+0100)
Subject: ukify: fix hwids section reproducibility
X-Git-Tag: v258-rc2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ddb2ee1721f568c3b9340e2dc78bd5b78bf397c;p=thirdparty%2Fsystemd.git

ukify: fix hwids section reproducibility

When there are multiple json files the glob list output is
not stable. Sort it before use.

Follow-up for 0333b9d5892983efc690d444fb8783624a1ef476
---

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 5bbe9b1ea68..8a8d72429fe 100755
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -1184,7 +1184,7 @@ def pack_strings(strings: set[str], base: int) -> tuple[bytes, dict[str, int]]:
 
 
 def parse_hwid_dir(path: Path) -> bytes:
-    hwid_files = path.rglob('*.json')
+    hwid_files = sorted(path.rglob('*.json'))
     devstr_to_type: dict[str, int] = {
         'devicetree': DEVICE_TYPE_DEVICETREE,
         'uefi-fw': DEVICE_TYPE_UEFI_FW,