From 5834b15f7184269a41c4de3188d4e06cc7a0dfdb Mon Sep 17 00:00:00 2001 From: zhangqiumiao Date: Tue, 18 May 2021 14:26:13 +0800 Subject: [PATCH] delete the Symbolic Link of grubenv in grub2-efi-x64 and grub-efi-aa64 packages (cherry picked from commit 36fb5429623ab49dd7c93e9b6e703f21fdc58a71) --- grub.macros | 3 --- grub2.spec | 8 +++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/grub.macros b/grub.macros index 0fdd725..7d215a4 100644 --- a/grub.macros +++ b/grub.macros @@ -511,8 +511,6 @@ install -D -m 700 unicode.pf2 \\\ $RPM_BUILD_ROOT%{efi_esp_dir}/fonts/unicode.pf2 \ ${RPM_BUILD_ROOT}/%{_bindir}/%{name}-editenv \\\ ${RPM_BUILD_ROOT}%{efi_esp_dir}/grubenv create \ -ln -sf ../efi/EFI/%{efi_vendor}/grubenv \\\ - $RPM_BUILD_ROOT/boot/grub2/grubenv \ cd .. \ %{nil} @@ -604,7 +602,6 @@ 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 \ %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 58665f5..97807c7 100644 --- a/grub2.spec +++ b/grub2.spec @@ -8,7 +8,7 @@ Name: grub2 Epoch: 1 Version: 2.04 -Release: 16 +Release: 17 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -449,6 +449,12 @@ rm -r /boot/grub2.tmp/ || : %{_datadir}/man/man* %changelog +* Tue May 18 2021 zhangqiumiao - 2.04-17 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:delete the Symbolic Link of grubenv in grub2-efi-x64 and grub-efi-aa64 packages + * Tue Mar 30 2021 zhangqiumiao - 2.04-16 - Type:bugfix - ID:NA -- Gitee