From 8d0b3c47db05e4391677a8b359a196f78f5d394b Mon Sep 17 00:00:00 2001 From: Sergio Correia Date: Mon, 17 Feb 2025 15:04:17 +0000 Subject: [PATCH] Drop old keylime policy related scripts The functionality provided by these scripts is now provided by the keylime-policy tool. Resolves: RHEL-79831 Signed-off-by: Sergio Correia --- keylime.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/keylime.spec b/keylime.spec index 3feaab1..b27cceb 100644 --- a/keylime.spec +++ b/keylime.spec @@ -208,14 +208,19 @@ for comp in "verifier" "tenant" "registrar" "ca" "logging"; do install -Dpm 400 config/${comp}.conf %{buildroot}/%{_sysconfdir}/%{srcname} done -# Ship some scripts. -mkdir -p %{buildroot}/%{_datadir}/%{srcname}/scripts -for s in create_mb_refstate \ - ek-openssl-verify; do - install -Dpm 755 scripts/${s} \ - %{buildroot}/%{_datadir}/%{srcname}/scripts/${s} +# Do not ship a few scripts that are to be obsoleted soon. +# The functionality they provide is now provided by keylime-policy. +for s in keylime_convert_runtime_policy \ + keylime_create_policy \ + keylime_sign_runtime_policy; do + rm -f %{buildroot}/%{_bindir}/"${s}" done +# Ship the ek-openssl-verify script. +mkdir -p %{buildroot}/%{_datadir}/%{srcname}/scripts +install -Dpm 755 scripts/ek-openssl-verify \ + %{buildroot}/%{_datadir}/%{srcname}/scripts/ek-openssl-verify + # Ship configuration templates. cp -r ./templates %{buildroot}%{_datadir}/%{srcname}/templates/ @@ -359,11 +364,7 @@ fi %license LICENSE %{python3_sitelib}/%{srcname}-*.egg-info/ %{python3_sitelib}/%{srcname} -%{_datadir}/%{srcname}/scripts/create_mb_refstate %{_bindir}/keylime_attest -%{_bindir}/keylime_convert_runtime_policy -%{_bindir}/keylime_create_policy -%{_bindir}/keylime_sign_runtime_policy %{_bindir}/keylime-policy