[packages/grub2] up to 2.16

atler atler at pld-linux.org
Wed Sep 23 18:32:21 CEST 2026 

commit 1e0943a726665d9a66ad282d3830477690d90301
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Sep 23 18:31:24 2026 +0200

    up to 2.16

 choose-preferred-initrd.patch   | 10 +++----
 grub-mkconfig-diagnostics.patch |  4 +--
 grub2.spec                      | 14 +++++-----
 image-base.patch                | 60 -----------------------------------------
 posix.patch                     |  2 +-
 5 files changed, 16 insertions(+), 74 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index ede9a1b..25393dd 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -143,12 +143,12 @@ Summary(hu.UTF-8):	GRUB2 - rendszerbetöltő x86 és ppc gépekhez
 Summary(pl.UTF-8):	GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
 Name:		grub2
-Version:	2.14
-Release:	5
+Version:	2.16
+Release:	1
 License:	GPL v2
 Group:		Base
-Source0:	https://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
-# Source0-md5:	383f9effad01c235d2535357ff717543
+Source0:	https://gitlab.freedesktop.org/api/v4/projects/26558/packages/generic/source-assets/grub-%{version}/grub-%{version}.tar.xz
+# Source0-md5:	1c611aa4712ce1ea447b9cbdfdb072a4
 Source1:	update-grub
 Source2:	update-grub.8
 Source3:	grub.sysconfig
@@ -165,7 +165,6 @@ Patch9:		just-say-linux.patch
 Patch10:	ignore-kernel-symlinks.patch
 Patch11:	choose-preferred-initrd.patch
 Patch12:	%{name}-cfg.patch
-Patch13:	image-base.patch
 Patch14:	md-name.patch
 Patch15:	x32.patch
 URL:		http://www.gnu.org/software/grub/
@@ -539,7 +538,6 @@ Motyw starfield dla GRUB-a.
 %patch -P10 -p1
 %patch -P11 -p1
 %patch -P12 -p0
-%patch -P13 -p1
 %patch -P14 -p1
 %patch -P15 -p1
 
@@ -691,6 +689,7 @@ fi
 %attr(755,root,root) %{_sbindir}/grub-mkconfig
 %attr(755,root,root) %{_sbindir}/grub-mklayout
 %attr(755,root,root) %{_sbindir}/grub-mknetdir
+%attr(755,root,root) %{_sbindir}/grub-mkpasswd-argon2
 %attr(755,root,root) %{_sbindir}/grub-mkpasswd-pbkdf2
 %attr(755,root,root) %{_sbindir}/grub-mkrelpath
 %attr(755,root,root) %{_sbindir}/grub-mkrescue
@@ -724,6 +723,7 @@ fi
 %{_mandir}/man1/grub-menulst2cfg.1*
 %{_mandir}/man1/grub-mklayout.1*
 %{_mandir}/man1/grub-mknetdir.1*
+%{_mandir}/man1/grub-mkpasswd-argon2.1*
 %{_mandir}/man1/grub-mkpasswd-pbkdf2.1*
 %{_mandir}/man1/grub-mkrelpath.1*
 %{_mandir}/man1/grub-mkrescue.1*
@@ -823,6 +823,7 @@ fi
 %files platform-efi
 %defattr(644,root,root,755)
 %attr(755,root,root) /lib/grub.d/30_uefi-firmware
+%attr(755,root,root) /lib/grub.d/31_efi_bootnext
 %dir %{_libexecdir}/%{efi_arch}-efi
 %{_libexecdir}/%{efi_arch}-efi/modinfo.sh
 %{_libexecdir}/%{efi_arch}-efi/*.lst
@@ -833,6 +834,7 @@ fi
 %{_libexecdir}/%{efi_arch}-efi/gdb_helper.py
 %{_libexecdir}/%{efi_arch}-efi/kernel.exec
 %{_libexecdir}/%{efi_arch}-efi/kernel.img
+%{_libexecdir}/%{efi_arch}-efi/sbat.csv
 %endif
 
 %if %{with ieee1275}
diff --git a/choose-preferred-initrd.patch b/choose-preferred-initrd.patch
index 5a083c6..d63f952 100644
--- a/choose-preferred-initrd.patch
+++ b/choose-preferred-initrd.patch
@@ -2,11 +2,11 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00
 --- grub-2.00.git20131218.orig/util/grub-mkconfig.in	2013-12-18 14:44:31.000000000 +0100
 +++ grub-2.00.git20131218/util/grub-mkconfig.in	2013-12-18 14:45:37.000000000 +0100
 @@ -255,7 +255,8 @@
-   GRUB_BADRAM \
-   GRUB_OS_PROBER_SKIP_LIST \
-   GRUB_DISABLE_SUBMENU \
--  GRUB_FORCE_EFI_ALL_VIDEO
-+  GRUB_FORCE_EFI_ALL_VIDEO \
+   GRUB_SIMPLE_ACCESS_LEVEL \
+   GRUB_ADVANCED_ACCESS_LEVEL \
+   GRUB_RECOVERY_ACCESS_LEVEL \
+-  GRUB_BOOTNEXT_OMIT_INACTIVE
++  GRUB_BOOTNEXT_OMIT_INACTIVE \
 +  GRUB_PREFER_DRACUT
  
  if test "x${grub_cfg}" != "x"; then
diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch
index 8cfd765..fd13f74 100644
--- a/grub-mkconfig-diagnostics.patch
+++ b/grub-mkconfig-diagnostics.patch
@@ -165,9 +165,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in gru
  
 -  gettext_printf "Found %s on %s (%s)\n" "$OS" "$drv" "$dev" >&2
 +  gettext_printf "Found %s on %s (%s)\n" "$OS" "$drv" "$dev" >&3
+   allowed_user_list="$(grub_get_auth_user_list $GRUB_SIMPLE_ACCESS_LEVEL)"
    cat << EOF
- menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' {
- EOF
+ menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' ${allowed_user_list}{
 --- grub-2.04/util/grub.d/20_linux_xen.in.orig	2019-04-23 10:54:47.000000000 +0200
 +++ grub-2.04/util/grub.d/20_linux_xen.in	2019-07-05 13:55:11.220267798 +0200
 @@ -243,7 +243,7 @@
diff --git a/image-base.patch b/image-base.patch
deleted file mode 100644
index f9510cf..0000000
--- a/image-base.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-; revert https://www.mail-archive.com/grub-devel%40gnu.org/msg43001.html
-diff --git b/acinclude.m4 a/acinclude.m4
-index 70c1912f8..fa7840f09 100644
---- b/acinclude.m4
-+++ a/acinclude.m4
-@@ -79,11 +79,6 @@ AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE],
- [AC_MSG_CHECKING([whether ${TARGET_OBJCOPY} works for absolute addresses])
- AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
- [cat > conftest.c <<\EOF
--asm (
--    ".globl start, _start, __start\n"
--    ".ifdef cmain; .set start = _start = __start = cmain\n.endif\n"
--    ".ifdef _cmain; .set start = _start = __start = _cmain\n.endif\n"
--);
- void cmain (void);
- void
- cmain (void)
---- grub-2.14/configure.ac.org	2026-03-03 12:54:23.256474391 +0100
-+++ grub-2.14/configure.ac	2026-03-03 12:54:38.716838858 +0100
-@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_forma
-   TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/i386-cygwin-img-ld.sc"
-   TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
-   TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/i386-cygwin-img-ld.sc"
-+  TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
-   TARGET_IMG_CFLAGS=
- else
-   TARGET_APPLE_LINKER=0
-@@ -1468,6 +1469,7 @@ else
-   TARGET_IMG_LDSCRIPT=
-   TARGET_IMG_LDFLAGS='-Wl,-N'
-   TARGET_IMG_LDFLAGS_AC='-Wl,-N'
-+  TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
-   TARGET_IMG_CFLAGS=
- fi
- 
-@@ -1792,24 +1794,7 @@ LIBS=""
- # Defined in acinclude.m4.
- grub_ASM_USCORE
- grub_PROG_TARGET_CC
--
--# The error message produced by autoconf if autoconf-archive is not installed is
--# quite misleading and not very helpful. So, try point people in the right direction.
--m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])])
--
- if test "x$TARGET_APPLE_LINKER" != x1 ; then
--AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000],
--    [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"],
--    [TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"],
--    [],
--    [AC_LANG_SOURCE([
--asm (".globl start; start:");
--asm (".globl _start; _start:");
--asm (".globl __start; __start:");
--void __main (void);
--void __main (void) {}
--int main (void);
--    ])])
- grub_PROG_OBJCOPY_ABSOLUTE
- fi
- grub_PROG_LD_BUILD_ID_NONE
diff --git a/posix.patch b/posix.patch
index 18ab55a..46b7fda 100644
--- a/posix.patch
+++ b/posix.patch
@@ -6,4 +6,4 @@
 +set -o posix
  
  # Generate grub.cfg by inspecting /boot contents.
- # Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
+ # Copyright (C) 2006,2007,2008,2009,2010,2026 Free Software Foundation, Inc.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/1e0943a726665d9a66ad282d3830477690d90301

More information about the pld-cvs-commit mailing list