From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Tue, 6 Feb 2024 11:55:17 +0000 (+0100)
Subject: mkosi-initrd: split Debian/Ubuntu config for libtss dependencies by release
X-Git-Tag: v21~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c2f0f73bf146789531c782bfdd3437a5c7342c8;p=thirdparty%2Fmkosi.git

mkosi-initrd: split Debian/Ubuntu config for libtss dependencies by release

The package changes from libtss2-mu0 to libtss2-mu-4.0.1-0 in Debian
trixie.

Also remove unnecessary escaping in the regex.

Fixes: #2346
---

diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
similarity index 84%
rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu.conf
rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 3fbd8737c..e8b265c9f 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -17,10 +17,6 @@ Packages=
 
         # Various libraries that are dlopen'ed by systemd
         libfido2-1
-        ^libtss2-esys-[0-9\.]+-0$
-        libtss2-rc0
-        ^libtss2-mu[0-9\.-]+$
-        libtss2-tcti-device0
 
 RemovePackages=
         # TODO: Remove dpkg if dash ever loses its dependency on it.
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debian-ubuntu-libtss-old.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debian-ubuntu-libtss-old.conf
new file mode 100644
index 000000000..155f20632
--- /dev/null
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debian-ubuntu-libtss-old.conf
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=debian
+Release=|bullseye
+Release=|bookworm
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=|jammy
+Release=|lunar
+Release=|mantic
+
+[Content]
+Packages=
+        ^libtss2-esys-[0-9.]+-0$
+        libtss2-rc0
+        libtss2-tcti-device0
+        libtss2-mu0
diff --git a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debian-ubuntu-libtss.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debian-ubuntu-libtss.conf
new file mode 100644
index 000000000..4903d56d0
--- /dev/null
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debian-ubuntu-libtss.conf
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[TriggerMatch]
+Distribution=debian
+Release=!bullseye
+Release=!bookworm
+
+[TriggerMatch]
+Distribution=ubuntu
+Release=!focal
+Release=!jammy
+Release=!lunar
+Release=!mantic
+
+[Content]
+Packages=
+        ^libtss2-esys-[0-9.]+-0$
+        libtss2-rc0
+        libtss2-tcti-device0
+        ^libtss2-mu-[0-9.]+-0$