From f9d9b4bbb7cc135e1c24f279560263a3d5426a92 Mon Sep 17 00:00:00 2001 From: duyiwei Date: Thu, 30 Jun 2022 11:59:41 +0000 Subject: [PATCH 1/3] move %pre to %pretrans --- grub.macros | 4 ++-- grub2.spec | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/grub.macros b/grub.macros index cc2d335..f97a34a 100644 --- a/grub.macros +++ b/grub.macros @@ -287,7 +287,7 @@ Requires: %{name}-common = %{evr} \ Requires: %{name}-tools-minimal >= %{evr} \ Requires: %{name}-tools-extra = %{evr} \ Requires: %{name}-tools = %{evr} \ -Requires(pre): %{name}-tools = %{evr} \ +Requires(pretrans): %{name}-tools = %{evr} \ Requires(postun): %{name}-tools = %{evr} \ Provides: %{name}-efi = %{evr} \ %{?legacy_provides:Provides: %{name} = %{evr}} \ @@ -296,7 +296,7 @@ Provides: %{name}-efi = %{evr} \ %{expand:%%description %{1}} \ %{desc} \ This subpackage provides support for %{1} systems. \ -%pre %{1} \ +%pretrans %{1} \ res=$(grub2-probe /boot) \ if [ "xvfat" != "x$res" -a "xfat" != "x$res" ]; then \ ln -sf ../efi/EFI/%{efi_vendor}/grubenv /boot/grub2/grubenv \ diff --git a/grub2.spec b/grub2.spec index db22e07..c62f59f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 10 +Release: 11 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -436,6 +436,12 @@ fi %{_datadir}/man/man* %changelog +* Thu Jun 30 2022 duyiwei - 1:2.06-11 +- Type:NA +- ID:NA +- SUG:NA +- DESC:move %pre to do_efi_install + * Wed Jun 29 2022 zhangqiumiao - 1:2.06-10 - Type:requirement - CVE:NA -- Gitee From 740c4f11e463354ab571fe5241cd6736a4a52996 Mon Sep 17 00:00:00 2001 From: duyiwei Date: Tue, 12 Jul 2022 01:54:52 +0000 Subject: [PATCH 2/3] update grub.macros. --- grub.macros | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub.macros b/grub.macros index f97a34a..da84644 100644 --- a/grub.macros +++ b/grub.macros @@ -287,7 +287,7 @@ Requires: %{name}-common = %{evr} \ Requires: %{name}-tools-minimal >= %{evr} \ Requires: %{name}-tools-extra = %{evr} \ Requires: %{name}-tools = %{evr} \ -Requires(pretrans): %{name}-tools = %{evr} \ +Requires(pretrans): %{name}-tools = %{evr} \ Requires(postun): %{name}-tools = %{evr} \ Provides: %{name}-efi = %{evr} \ %{?legacy_provides:Provides: %{name} = %{evr}} \ -- Gitee From 3ac85306d284c4f558bd9babeea770e2bbd14663 Mon Sep 17 00:00:00 2001 From: duyiwei Date: Tue, 19 Jul 2022 05:45:01 +0000 Subject: [PATCH 3/3] update grub.macros. --- grub.macros | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub.macros b/grub.macros index da84644..5725647 100644 --- a/grub.macros +++ b/grub.macros @@ -287,7 +287,7 @@ Requires: %{name}-common = %{evr} \ Requires: %{name}-tools-minimal >= %{evr} \ Requires: %{name}-tools-extra = %{evr} \ Requires: %{name}-tools = %{evr} \ -Requires(pretrans): %{name}-tools = %{evr} \ +Requires(posttrans): %{name}-tools = %{evr} \ Requires(postun): %{name}-tools = %{evr} \ Provides: %{name}-efi = %{evr} \ %{?legacy_provides:Provides: %{name} = %{evr}} \ @@ -296,7 +296,7 @@ Provides: %{name}-efi = %{evr} \ %{expand:%%description %{1}} \ %{desc} \ This subpackage provides support for %{1} systems. \ -%pretrans %{1} \ +%posttrans %{1} \ res=$(grub2-probe /boot) \ if [ "xvfat" != "x$res" -a "xfat" != "x$res" ]; then \ ln -sf ../efi/EFI/%{efi_vendor}/grubenv /boot/grub2/grubenv \ -- Gitee