From ad76a59164850f145e1f2390dda75fa502afb3e9 Mon Sep 17 00:00:00 2001
From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Tue, 6 Feb 2024 12:55:17 +0100
Subject: [PATCH] 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
---
 .../mkosi.conf.d/10-debian-ubuntu.conf        |  4 ----
 .../20-debian-ubuntu-libtss-old.conf          | 19 +++++++++++++++++++
 .../mkosi.conf.d/20-debian-ubuntu-libtss.conf | 17 +++++++++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 mkosi/resources/mkosi-initrd/mkosi.conf.d/20-debian-ubuntu-libtss-old.conf
 create mode 100644 mkosi/resources/mkosi-initrd/mkosi.conf.d/20-debian-ubuntu-libtss.conf

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.conf
index 82d844fc0b..e8b265c9fa 100644
--- a/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu.conf
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/10-debian-ubuntu.conf
@@ -17,10 +17,6 @@ Packages=
 
         # Various libraries that are dlopen'ed by systemd
         libfido2-1
-        ^libtss2-esys-[0-9\.]+-0$
-        libtss2-rc0
-        libtss2-mu0
-        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/20-debian-ubuntu-libtss-old.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/20-debian-ubuntu-libtss-old.conf
new file mode 100644
index 0000000000..fc3123f424
--- /dev/null
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/20-debian-ubuntu-libtss-old.conf
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|debian
+Distribution=|ubuntu
+
+[Match]
+Release=|bullseye
+Release=|bookworm
+Release=!focal
+Release=|jammy
+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/20-debian-ubuntu-libtss.conf b/mkosi/resources/mkosi-initrd/mkosi.conf.d/20-debian-ubuntu-libtss.conf
new file mode 100644
index 0000000000..0a05826a64
--- /dev/null
+++ b/mkosi/resources/mkosi-initrd/mkosi.conf.d/20-debian-ubuntu-libtss.conf
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|debian
+Distribution=|ubuntu
+
+[Match]
+Release=!bullseye
+Release=!bookworm
+Release=|noble
+
+[Content]
+Packages=
+        ^libtss2-esys-[0-9.]+-0$
+        libtss2-rc0
+        libtss2-tcti-device0
+        ^libtss2-mu-[0-9.]+-0$