diff mbox series

[isar-cip-core,5/9] initramfs-crypt-hook: Make dependencies release-specific and add trixie support

Message ID 3e27ea182df73993bf5bc4d6a0521601ae818b15.1730977077.git.jan.kiszka@siemens.com (mailing list archive)
State New
Headers show
Series Enable early Debian trixie support, drop sid | expand

Commit Message

Jan Kiszka Nov. 7, 2024, 10:57 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Rather than making the list of alternatives longer and longer, append
dependencies depending on the selected Debian release. Will also make it
easier to clean up when we once drop support for a release.

Along with this refactoring comes the list of dependencies needed with
trixie.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ...s-crypt-hook_0.3.bb => initramfs-crypt-hook_0.4.bb} | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename recipes-initramfs/initramfs-crypt-hook/{initramfs-crypt-hook_0.3.bb => initramfs-crypt-hook_0.4.bb} (89%)
diff mbox series

Patch

diff --git a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.3.bb b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.4.bb
similarity index 89%
rename from recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.3.bb
rename to recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.4.bb
index 72de5b6c..03a2bf44 100644
--- a/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.3.bb
+++ b/recipes-initramfs/initramfs-crypt-hook/initramfs-crypt-hook_0.4.bb
@@ -10,14 +10,14 @@ 
 
 inherit dpkg-raw
 DEBIAN_DEPENDS = "initramfs-tools, cryptsetup, \
-    awk, openssl, libtss2-esys-3.0.2-0 | libtss2-esys0, \
-    libtss2-rc0 | libtss2-esys0, libtss2-mu0 | libtss2-esys0, \
-    e2fsprogs, tpm2-tools, coreutils, uuid-runtime"
+    awk, openssl,  e2fsprogs, tpm2-tools, coreutils, uuid-runtime"
 
 CLEVIS_DEPEND = ", clevis-luks, jose, bash, luksmeta, file, libpwquality-tools"
 
-DEBIAN_DEPENDS:append:buster = "${CLEVIS_DEPEND}, libgcc-7-dev"
-DEBIAN_DEPENDS:append:bullseye = "${CLEVIS_DEPEND}"
+DEBIAN_DEPENDS:append:buster = "${CLEVIS_DEPEND}, libgcc-7-dev, libtss2-esys0"
+DEBIAN_DEPENDS:append:bullseye = "${CLEVIS_DEPEND}, libtss2-esys-3.0.2-0, libtss2-rc0, libtss2-mu0"
+DEBIAN_DEPENDS:append:bookworm = ", libtss2-esys-3.0.2-0, libtss2-rc0, libtss2-mu0"
+DEBIAN_DEPENDS:append:trixie = ", systemd-cryptsetup, libtss2-esys-3.0.2-0t64, libtss2-rc0t64, libtss2-mu-4.0.1-0t64"
 DEBIAN_DEPENDS:append = "${@encryption_dependency(d)}"
 
 def encryption_dependency(d):