mkosi: add TPM2 packages to debian/ubuntu/fedora mkosi files

As suggested: https://github.com/systemd/systemd/pull/17741#issuecomment-743479834

diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 0f47bb5ad1d2c5fec9f2a57d269f39f37edc573e..69640fa81b766e7bc64bf8536e12e3e78d2c0d71 100644 (file)
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -24,7 +24,6 @@ BuildPackages=
         git
         gnu-efi
         gperf
-        libiptc-dev
         libacl1-dev
         libaudit-dev
         libblkid-dev
@@ -35,19 +34,23 @@ BuildPackages=
         libdbus-1-dev
         libdw-dev
         libfdisk-dev
+        libfido2-dev
         libgcrypt20-dev
         libgnutls28-dev
         libidn2-0-dev
+        libiptc-dev
         libkmod-dev
-        liblzma-dev
         liblz4-dev
         liblz4-tool
+        liblzma-dev
         libmicrohttpd-dev
         libmount-dev
         libpam0g-dev
         libqrencode-dev
         libseccomp-dev
         libsmartcols-dev
+        libssl-dev
+        libtss2-dev
         libxkbcommon-dev
         libzstd-dev
         m4
@@ -63,8 +66,12 @@ BuildPackages=
 
 Packages=
         gdb
+        libfdisk1
+        libfido2-1
         libidn2-0
         libqrencode4
+        # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically
+        libtss2-dev
         locales
         strace
 

diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index e113fd92a806f56c9e3163dd8847adcfbc8d9985..680e6fb6a48cfa6c23594d1b443cfee578a3cfdd 100644 (file)
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -66,6 +66,7 @@ BuildPackages=
         python3-lxml
         qrencode-devel
         rpm
+        tpm2-tss-devel
         tree
         valgrind-devel
         xz-devel
@@ -79,6 +80,7 @@ Packages=
         # procps-ng provides a set of useful utilies (ps, free, etc)
         procps-ng
         strace
+        tpm2-tss
 
 BuildDirectory=mkosi.builddir
 Cache=mkosi.cache

diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index 47a2b9c3f8e8ddcb16bfc7142de2218902caf1c0..1c22ee04abd3cf0f4f9a3567f8747d6f128598fb 100644 (file)
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -35,6 +35,7 @@ BuildPackages=
         libdbus-1-dev
         libdw-dev
         libfdisk-dev
+        libfido2-dev
         libgcrypt20-dev
         libgnutls28-dev
         libidn2-0-dev
@@ -50,6 +51,8 @@ BuildPackages=
         libqrencode-dev
         libseccomp-dev
         libsmartcols-dev
+        libssl-dev
+        libtss2-dev
         libxkbcommon-dev
         libxtables-dev
         libzstd-dev
@@ -67,8 +70,11 @@ BuildPackages=
 
 Packages=
         gdb
+        libfido2-1
         libidn2-0
         libqrencode4
+        # We pull in the -dev package here, since the binary ones appear to change names too often, and the -dev package pulls the right deps in automatically
+        libtss2-dev
         locales
         strace