rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop use of which and update requirements

Browse Source 
Original patches by Zbigniew Jędrzejewski-Szmek.

Merges: #16
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-04-12 14:42:54 -04:00
parent d17f80cfd5
commit 2e106f9a3e
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0059-Add-BLS-support-to-grub-mkconfig.patch
View File

@ -131,7 +131,7 @@ index fafeac950..d8bb40693 100644
fi
IFS="$old_ifs"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 7bb3a211a..9fcd77cac 100644
index 7bb3a211a..f1548a260 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -82,6 +82,218 @@ case x"$GRUB_FS" in
@ -248,7 +248,7 @@ index 7bb3a211a..9fcd77cac 100644
+}
+
+# Make BLS the default if GRUB_ENABLE_BLSCFG was not set and grubby is not installed.
+if [ -z "${GRUB_ENABLE_BLSCFG}" ] && [ -z "$(which new-kernel-pkg 2> /dev/null)" ]; then
+if [ -z "${GRUB_ENABLE_BLSCFG}" ] && ! command -v new-kernel-pkg >/dev/null; then
+ GRUB_ENABLE_BLSCFG="true"
+fi
+

2
0062-Add-grub2-switch-to-blscfg.patch
View File

@ -381,7 +381,7 @@ index 000000000..a851424be
+# Bye.
+exit 0
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 9fcd77cac..70d56518b 100644
index f1548a260..c02c1f082 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -138,7 +138,7 @@ blsdir="/boot/loader/entries"

2
0185-Don-t-update-the-cmdline-when-generating-legacy-menu.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 70d56518b..f8e868b6c 100644
index c02c1f082..6af84b44e 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -256,7 +256,9 @@ if [ -z "\${kernelopts}" ]; then

18
grub2.spec
View File

@ -17,7 +17,7 @@
Name: grub2
Epoch: 1
Version: 2.06
Release: 33%{?dist}
Release: 34%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -84,7 +84,9 @@ hardware devices.\
Summary: grub2 common layout
BuildArch: noarch
Conflicts: grubby < 8.40-18
Requires(post): util-linux
Requires(posttrans): util-linux-core
Requires(posttrans): coreutils
Requires(posttrans): grep
%description common
This package provides some directories which are required by various grub2
@ -94,9 +96,10 @@ subpackages.
Summary: Support tools for GRUB.
Obsoletes: %{name}-tools < %{evr}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: gettext os-prober which file
Requires: gettext os-prober file
Requires(pre): dracut
Requires(post): dracut
Requires(pre): grep
Requires(pre): sed
%description tools
%{desc}
@ -105,7 +108,7 @@ This subpackage provides tools for support of all platforms.
%ifarch x86_64
%package tools-efi
Summary: Support tools for GRUB.
Requires: gettext os-prober which file
Requires: gettext os-prober file
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-tools < %{evr}
@ -126,7 +129,7 @@ This subpackage provides tools for support of all platforms.
%package tools-extra
Summary: Support tools for GRUB.
Requires: gettext os-prober which file
Requires: gettext os-prober file
Requires: %{name}-tools-minimal = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-tools < %{evr}
@ -526,6 +529,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Tue Apr 12 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-34
- Bump for requirements updates; no code changes
* Thu Mar 31 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-33
- Drop i32 build for real this time