packages/grub2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grub2:add grub2-mount to grub2-tools-minimal subpackage

Browse Source 
Signed-off-by: yanan-rock <yanan@huawei.com>
(cherry picked from commit f2fa212e55fa8d03a2ee675f6624ed7978220b05)
This commit is contained in:
yanan-rock 2021-04-18 02:27:40 -04:00 committed by openeuler-sync-bot
parent 4180ef6f1f
commit c643ad21f7
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grub.macros
View File

@ -360,7 +360,6 @@ PYTHON=python3 ./autogen.sh \
--target=%{1} \\\ --target=%{1} \\\
--with-grubdir=%{name} \\\ --with-grubdir=%{name} \\\
--program-transform-name=s,grub,%{name}, \\\ --program-transform-name=s,grub,%{name}, \\\
--disable-grub-mount \\\
--disable-werror || ( cat config.log ; exit 1 ) \ --disable-werror || ( cat config.log ; exit 1 ) \
git add . \ git add . \
git commit -m "After efi configure" \ git commit -m "After efi configure" \
@ -449,7 +448,6 @@ cd grub-%{1}-%{tarversion} \
--target=%{_target_platform} \\\ --target=%{_target_platform} \\\
--with-grubdir=%{name} \\\ --with-grubdir=%{name} \\\
--program-transform-name=s,grub,%{name}, \\\ --program-transform-name=s,grub,%{name}, \\\
--disable-grub-mount \\\
--disable-werror || ( cat config.log ; exit 1 ) \ --disable-werror || ( cat config.log ; exit 1 ) \
git add . \ git add . \
git commit -m "After legacy configure" \ git commit -m "After legacy configure" \

10
grub2.spec
View File

@ -30,7 +30,7 @@ Source12: installkernel.in
BuildRequires: gcc efi-srpm-macros flex bison binutils python3 ncurses-devel xz-devel 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: freetype-devel libusb-devel bzip2-devel rpm-devel rpm-libs
BuildRequires: autoconf automake autogen device-mapper-devel freetype-devel git 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} %ifarch %{golang_arches}
BuildRequires: pesign >= 0.99-8 BuildRequires: pesign >= 0.99-8
@ -221,6 +221,7 @@ cat << EOF > grub2.conf
# these have execstack, and break under selinux # these have execstack, and break under selinux
-b /usr/bin/grub2-script-check -b /usr/bin/grub2-script-check
-b /usr/bin/grub2-mkrelpath -b /usr/bin/grub2-mkrelpath
-b /usr/bin/grub2-mount
-b /usr/bin/grub2-fstest -b /usr/bin/grub2-fstest
-b /usr/sbin/grub2-bios-setup -b /usr/sbin/grub2-bios-setup
-b /usr/sbin/grub2-probe -b /usr/sbin/grub2-probe
@ -402,6 +403,7 @@ rm -r /boot/grub2.tmp/ || :
%{_sbindir}/%{name}-set-default %{_sbindir}/%{name}-set-default
%{_bindir}/%{name}-editenv %{_bindir}/%{name}-editenv
%{_bindir}/%{name}-mkpasswd-pbkdf2 %{_bindir}/%{name}-mkpasswd-pbkdf2
%{_bindir}/%{name}-mount
%files tools-extra %files tools-extra
%defattr(-,root,root) %defattr(-,root,root)
@ -449,11 +451,13 @@ rm -r /boot/grub2.tmp/ || :
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Tue May 18 2021 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.04-17 * Tue May 25 2021 yanan <yanan@huawei.com> - 2.04-17
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA
- SUG: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 <zhangqiumiao1@huawei.com> - 2.04-16 * Tue Mar 30 2021 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.04-16
- Type:bugfix - Type:bugfix