From 280cb983d4d1f453c15d6d073a25f9176d09482f Mon Sep 17 00:00:00 2001 From: yanan-rock Date: Sun, 18 Apr 2021 02:27:40 -0400 Subject: [PATCH 1/4] grub2:add grub2-mount to grub2-tools-minimal subpackage Signed-off-by: yanan-rock (cherry picked from commit f2fa212e55fa8d03a2ee675f6624ed7978220b05) --- grub.macros | 2 -- grub2.spec | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/grub.macros b/grub.macros index 7d215a4..52b160e 100644 --- a/grub.macros +++ b/grub.macros @@ -360,7 +360,6 @@ PYTHON=python3 ./autogen.sh \ --target=%{1} \\\ --with-grubdir=%{name} \\\ --program-transform-name=s,grub,%{name}, \\\ - --disable-grub-mount \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After efi configure" \ @@ -449,7 +448,6 @@ cd grub-%{1}-%{tarversion} \ --target=%{_target_platform} \\\ --with-grubdir=%{name} \\\ --program-transform-name=s,grub,%{name}, \\\ - --disable-grub-mount \\\ --disable-werror || ( cat config.log ; exit 1 ) \ git add . \ git commit -m "After legacy configure" \ diff --git a/grub2.spec b/grub2.spec index 50e2d68..8e270a3 100644 --- a/grub2.spec +++ b/grub2.spec @@ -30,7 +30,7 @@ Source12: installkernel.in BuildRequires: gcc efi-srpm-macros flex bison binutils python3 ncurses-devel xz-devel BuildRequires: freetype-devel libusb-devel bzip2-devel rpm-devel rpm-libs BuildRequires: autoconf automake autogen device-mapper-devel freetype-devel git -BuildRequires: texinfo gettext-devel dejavu-sans-fonts help2man systemd +BuildRequires: texinfo gettext-devel dejavu-sans-fonts help2man systemd fuse-devel %ifarch %{golang_arches} BuildRequires: pesign >= 0.99-8 @@ -221,6 +221,7 @@ cat << EOF > grub2.conf # these have execstack, and break under selinux -b /usr/bin/grub2-script-check -b /usr/bin/grub2-mkrelpath +-b /usr/bin/grub2-mount -b /usr/bin/grub2-fstest -b /usr/sbin/grub2-bios-setup -b /usr/sbin/grub2-probe @@ -402,6 +403,7 @@ rm -r /boot/grub2.tmp/ || : %{_sbindir}/%{name}-set-default %{_bindir}/%{name}-editenv %{_bindir}/%{name}-mkpasswd-pbkdf2 +%{_bindir}/%{name}-mount %files tools-extra %defattr(-,root,root) @@ -449,11 +451,13 @@ rm -r /boot/grub2.tmp/ || : %{_datadir}/man/man* %changelog -* Tue May 18 2021 zhangqiumiao - 2.04-17 +* Tue May 25 2021 yanan - 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 +- DESC:add grub2-mount to grub2-tools-minimal subpackage + the dependency om dmsetup is deleted from os-prober,and the grub2-mount command is required. + so add this command. * Tue Mar 30 2021 zhangqiumiao - 2.04-16 - Type:bugfix -- Gitee From bff88931e6edc33f6dffa4dca92bfeef31b086ab Mon Sep 17 00:00:00 2001 From: zhangqiumiao Date: Tue, 18 May 2021 14:26:13 +0800 Subject: [PATCH 2/4] delete the Symbolic Link of grubenv in grub2-efi-x64 and grub-efi-aa64 packages (cherry picked from commit 36fb5429623ab49dd7c93e9b6e703f21fdc58a71) (cherry picked from commit 5220c91fd207a5f13a11df1c46d49f15a4f6f44d) --- grub2.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/grub2.spec b/grub2.spec index 8e270a3..bc26df1 100644 --- a/grub2.spec +++ b/grub2.spec @@ -451,13 +451,11 @@ rm -r /boot/grub2.tmp/ || : %{_datadir}/man/man* %changelog -* Tue May 25 2021 yanan - 2.04-17 +* Tue May 18 2021 zhangqiumiao - 2.04-17 - Type:bugfix - ID:NA - SUG:NA -- DESC:add grub2-mount to grub2-tools-minimal subpackage - the dependency om dmsetup is deleted from os-prober,and the grub2-mount command is required. - so add this command. +- 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 -- Gitee From 0ea07f6c119acf16c2c6a534cbc337717f025872 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Tue, 25 May 2021 22:32:35 +0800 Subject: [PATCH 3/4] !92 [sync] PR-88: delete the Symbolic Link of grubenv in grub2-efi-x64 and grub-efi-aa64 packages From: @openeuler-sync-bot Reviewed-by: @yanan-rock Signed-off-by: @yanan-rock (cherry picked from commit 66796c4951805eed18be53dbb58a55e4e6aa7f76) -- Gitee From 293f7732ba5bc0d051607374c3de21f2ca1ec589 Mon Sep 17 00:00:00 2001 From: yanan-rock Date: Sun, 18 Apr 2021 03:31:21 -0400 Subject: [PATCH 4/4] grub2:add grub2-mount to grub2-tools-minimal subpackage Signed-off-by: yanan-rock (cherry picked from commit 0718bb82b4859152281196067743db25615773c7) --- grub2.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/grub2.spec b/grub2.spec index bc26df1..45f3c59 100644 --- a/grub2.spec +++ b/grub2.spec @@ -8,7 +8,7 @@ Name: grub2 Epoch: 1 Version: 2.04 -Release: 17 +Release: 18 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -451,6 +451,12 @@ rm -r /boot/grub2.tmp/ || : %{_datadir}/man/man* %changelog +* Tue May 25 2021 yanan - 2.04-18 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:delete the Symbolic Link of grubenv in grub2-efi-x64 and grub-efi-aa64 packages + * Tue May 18 2021 zhangqiumiao - 2.04-17 - Type:bugfix - ID:NA -- Gitee