From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sun, 22 Jun 2025 17:18:53 +0000 (+0100)
Subject: mkosi: workaround for opensuse spec file to pick up new import-pubring filename
X-Git-Tag: v258-rc1~261^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4da911c1e52e1431f9678a1fd1966ac737cf1534;p=thirdparty%2Fsystemd.git

mkosi: workaround for opensuse spec file to pick up new import-pubring filename
---

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
index ea1acb62f50..84a38a51a7e 100755
--- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
@@ -19,9 +19,9 @@ TS="${SOURCE_DATE_EPOCH:-$(date +%s)}"
 # disable manpage compression as the files cannot be found. Fix the issue by removing the compression
 # extension.
 #
-# TODO: remove manual cgroups-agent patch when the upstream spec is updated
+# TODO: remove manual cgroups-agent and pubring patches when the upstream spec is updated
 while read -r filelist; do
-    sed 's/\.gz$//; /systemd-cgroups-agent/d' "$filelist" >"/tmp/$(basename "$filelist")"
+    sed 's/\.gz$//; /systemd-cgroups-agent/d; s/import-pubring.gpg/import-pubring.pgp/' "$filelist" >"/tmp/$(basename "$filelist")"
     mount --bind "/tmp/$(basename "$filelist")" "$filelist"
 done < <(find "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}" -name "files.*")