From ec73df1b6e64cfe50319326c242236890f23c7c3 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 30 Dec 2020 17:59:39 +0100 Subject: [PATCH] Fix tps-rpmtest failing due /boot/grub2/grubenv attributes mismatch The /boot/grub2/grubenv file is not installed by the grub2 packages but is either a symbolic link created on %install or a regular file created by Anaconda during installation. This is causing the tps-rpmtest to fail in some architectures since the file attributes don't match what's expected by the package. Because is a special file, make verification to ignore the size, mode, checksum and mtime attributes. Signed-off-by: Javier Martinez Canillas --- grub.macros | 2 +- grub2.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub.macros b/grub.macros index c451aad..e6d28a1 100644 --- a/grub.macros +++ b/grub.macros @@ -604,7 +604,7 @@ touch ${RPM_BUILD_ROOT}/boot/%{name}/grub.cfg \ %dir %attr(0700,root,root)%{efi_esp_dir}/fonts \ %dir %attr(0700,root,root)/boot/loader/entries \ %ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg \ -%config(noreplace) /boot/grub2/grubenv \ +%config(noreplace) %verify(not size mode md5 mtime) /boot/grub2/grubenv \ %ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grubenv \ %{expand:%if 0%{?without_efi_modules} \ %exclude %{_libdir}/grub/%{6} \ diff --git a/grub2.spec b/grub2.spec index 477238a..8d12616 100644 --- a/grub2.spec +++ b/grub2.spec @@ -358,7 +358,7 @@ rm -r /boot/grub2.tmp/ || : %exclude /boot/grub2/* %dir %attr(0700,root,root) %{efi_esp_dir} %exclude %{efi_esp_dir}/* -%ghost %config(noreplace) /boot/grub2/grubenv +%ghost %config(noreplace) %verify(not size mode md5 mtime) /boot/grub2/grubenv %license COPYING %doc THANKS %doc docs/grub.html