From c745c33e884e1a3f55f453fa3b44396b23f5ce24141f5e1872b450bd90bfac77 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 1 Jul 2021 08:51:02 +0000 Subject: [PATCH] Accepting request 902825 from home:favogt:microtpm - Enable TPM2 support - Enable TPM2 support OBS-URL: https://build.opensuse.org/request/show/902825 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1167 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 7 +++++++ systemd.changes | 5 +++++ systemd.spec | 7 +++++++ 4 files changed, 24 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 5c51d4f8..c11e4dc7 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -15,6 +15,11 @@ Mon Jun 28 16:45:04 UTC 2021 - Franck Bui 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 +------------------------------------------------------------------- +Mon Jun 28 12:46:04 UTC 2021 - Fabian Vogt + +- Enable TPM2 support + ------------------------------------------------------------------- Thu Jun 24 13:39:30 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index cef89604..65f56a41 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -83,6 +83,9 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(tss2-esys) +BuildRequires: pkgconfig(tss2-mu) +BuildRequires: pkgconfig(tss2-rc) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif @@ -134,6 +137,9 @@ Requires: group(lock) Recommends: libpcre2-8-0 # ditto but dlopen()ed by systemd-cryptenroll Recommends: libfido2 +Recommends: libtss2-esys0 +Recommends: libtss2-mu0 +Recommends: libtss2-rc0 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -588,6 +594,7 @@ Have fun with these services at your own risk. %if 0%{?bootstrap} -Dnss-myhostname=false \ %else + -Dtpm2=true \ -Dman=true \ -Dhtml=true \ %endif diff --git a/systemd.changes b/systemd.changes index 5c51d4f8..c11e4dc7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -15,6 +15,11 @@ Mon Jun 28 16:45:04 UTC 2021 - Franck Bui 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 +------------------------------------------------------------------- +Mon Jun 28 12:46:04 UTC 2021 - Fabian Vogt + +- Enable TPM2 support + ------------------------------------------------------------------- Thu Jun 24 13:39:30 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 9ba18701..1b9aeaae 100644 --- a/systemd.spec +++ b/systemd.spec @@ -81,6 +81,9 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(tss2-esys) +BuildRequires: pkgconfig(tss2-mu) +BuildRequires: pkgconfig(tss2-rc) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif @@ -132,6 +135,9 @@ Requires: group(lock) Recommends: libpcre2-8-0 # ditto but dlopen()ed by systemd-cryptenroll Recommends: libfido2 +Recommends: libtss2-esys0 +Recommends: libtss2-mu0 +Recommends: libtss2-rc0 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -586,6 +592,7 @@ Have fun with these services at your own risk. %if 0%{?bootstrap} -Dnss-myhostname=false \ %else + -Dtpm2=true \ -Dman=true \ -Dhtml=true \ %endif