[OS-BUILD PATCH] kernel.spec: Remove kernel-keys directory on rpm erase

[GitLab Bridge on behalf of prarit]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

An empty /usr/share/doc/kernel-keys/VR directory is left after executing
an 'rpm -e kernel-core-VR'.

Remove the directory when the rpm is erased.

v2: Only list directory and simplify code (bmeneg)

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;
Cc: Bruno Meneguele <bmeneg(a)redhat.com&gt;
Cc: "Herton R. Krzesinski" <herton(a)redhat.com&gt;
---
 redhat/kernel.spec.template | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index d47c9cce8a0e..3d0723678e96 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2601,12 +2601,7 @@ fi
 /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
-%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca*.cer\
-%ifarch s390x ppc64le\
-%if 0%{!?4:1}\
-%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/%{signing_key_filename} \
-%endif\
-%endif\
+%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\
 %if %{1}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
 %endif\
-- 
GitLab

[Herton R. Krzesinski]

On Tue, Aug 04, 2020 at 02:33:17PM -0000, GitLab Bridge on behalf of prarit wrote:
>  From: Prarit Bhargava <prarit(a)redhat.com&gt;
>  
>  An empty /usr/share/doc/kernel-keys/VR directory is left after executing
>  an 'rpm -e kernel-core-VR'.
>  
>  Remove the directory when the rpm is erased.
>  
>  v2: Only list directory and simplify code (bmeneg)
>  
>  Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;
>  Cc: Bruno Meneguele <bmeneg(a)redhat.com&gt;
>  Cc: "Herton R. Krzesinski" <herton(a)redhat.com&gt;
>  ---
>   redhat/kernel.spec.template | 7 +------
>   1 file changed, 1 insertion(+), 6 deletions(-)
>  
>  diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
>  index d47c9cce8a0e..3d0723678e96 100644
>  --- a/redhat/kernel.spec.template
>  +++ b/redhat/kernel.spec.template
>  @@ -2601,12 +2601,7 @@ fi
>   /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
>   /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
>   /lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
>  -%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca*.cer\
>  -%ifarch s390x ppc64le\
>  -%if 0%{!?4:1}\
>  -%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/%{signing_key_filename} \
>  -%endif\
>  -%endif\
>  +%{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\
>   %if %{1}\
>   /lib/modules/%{KVERREL}%{?3:+%{3}}/vdso\
>   %endif\
>  -- 
>  GitLab
>   
Acked-by: Herton R. Krzesinski <herton(a)redhat.com&gt;

-- 
[]'s
Herton