rpms/grub2
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tps-rpmtest failing due /boot/grub2/grubenv attributes mismatch

Browse Source 
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 <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2020-12-30 17:59:39 +01:00
parent 96eeab8abd
commit ec73df1b6e
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub.macros
View File

@ -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)%{efi_esp_dir}/fonts \
%dir %attr(0700,root,root)/boot/loader/entries \ %dir %attr(0700,root,root)/boot/loader/entries \
%ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grub.cfg \ %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 \ %ghost %config(noreplace) %attr(0700,root,root)%{efi_esp_dir}/grubenv \
%{expand:%if 0%{?without_efi_modules} \ %{expand:%if 0%{?without_efi_modules} \
%exclude %{_libdir}/grub/%{6} \ %exclude %{_libdir}/grub/%{6} \

2
grub2.spec
View File

@ -358,7 +358,7 @@ rm -r /boot/grub2.tmp/ || :
%exclude /boot/grub2/* %exclude /boot/grub2/*
%dir %attr(0700,root,root) %{efi_esp_dir} %dir %attr(0700,root,root) %{efi_esp_dir}
%exclude %{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 %license COPYING
%doc THANKS %doc THANKS
%doc docs/grub.html %doc docs/grub.html