mkosi-initrd: Merge libtss configs again

Removing the Suggests on the old name from systemd in Debian Testing
seems to have fixed the apt error we were getting before.

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
deleted file mode 100644 (file)
index 6aff845..0000000
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debian-ubuntu-libtss.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-mu-[0-9.]+-0$
-        libtss2-rc0
-        libtss2-tcti-device0

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-libtss.conf
similarity index 68%
rename from mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-debian-ubuntu-libtss-old.conf
rename to mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/10-libtss.conf
index 155f206325080f0eed14a071ce8ffb21776e597f..5578e218ffecf921376b33a6f097e35f5f61b050 100644 (file)
--- 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-libtss.conf
@@ -2,18 +2,14 @@
 
 [TriggerMatch]
 Distribution=debian
-Release=|bullseye
-Release=|bookworm
 
 [TriggerMatch]
 Distribution=ubuntu
-Release=|jammy
-Release=|lunar
-Release=|mantic
+Release=!focal
 
 [Content]
 Packages=
         ^libtss2-esys-[0-9.]+-0$
+        ^libtss2-mu[0-9.-]+$
         libtss2-rc0
         libtss2-tcti-device0
-        libtss2-mu0