* [PATCH 2/2] grub: upgrade 2.14 -> 2.16
2026-11-16 22:49 [PATCH 1/2] grub: update upstream-check Peter Marko
@ 2026-11-16 22:49 ` Peter Marko
2026-11-17 18:42 ` [OE-core] [PATCH 1/2] grub: update upstream-check Mathieu Dubois-Briand
1 sibling, 0 replies; 6+ messages in thread
From: Peter Marko @ 2026-11-16 22:49 UTC (permalink / raw)
To: openembedded-core; +Cc: Peter Marko
From: Peter Marko <peter.marko@siemens.com>
Solves CVE-2026-97876.
Release information: [1]
Changes: [2]
* update SRC_URI to new location and switch from tag.gz to tar.xz
* remove commits included in this release: [3] and [4]
* refresh remaining commits via devtool
* remove obsolete CVE_STATUS entries
[1] https://gitlab.freedesktop.org/gnu-grub/grub/-/releases/grub-2.16
[2] https://gitlab.freedesktop.org/gnu-grub/grub/-/blob/grub-2.16/NEWS?ref_type=tags
[3] https://gitlab.freedesktop.org/gnu-grub/grub/-/commit/1dc2986c7e8480d955f87d276d31400116a21fac
[4] https://gitlab.freedesktop.org/gnu-grub/grub/-/commit/7b72d6cbd548f714a0122c3cd1dd9a70db10894a
Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
...-Check-linker-for-image-base-support.patch | 73 -------------------
...-Print-a-more-helpful-error-if-autoc.patch | 34 ---------
...b.d-10_linux.in-add-oe-s-kernel-name.patch | 4 +-
.../{grub-efi_2.14.bb => grub-efi_2.16.bb} | 0
meta/recipes-bsp/grub/grub2.inc | 12 +--
.../grub/{grub_2.14.bb => grub_2.16.bb} | 0
6 files changed, 4 insertions(+), 119 deletions(-)
delete mode 100644 meta/recipes-bsp/grub/files/0001-Revert-configure-Check-linker-for-image-base-support.patch
delete mode 100644 meta/recipes-bsp/grub/files/0002-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
rename meta/recipes-bsp/grub/{grub-efi_2.14.bb => grub-efi_2.16.bb} (100%)
rename meta/recipes-bsp/grub/{grub_2.14.bb => grub_2.16.bb} (100%)
diff --git a/meta/recipes-bsp/grub/files/0001-Revert-configure-Check-linker-for-image-base-support.patch b/meta/recipes-bsp/grub/files/0001-Revert-configure-Check-linker-for-image-base-support.patch
deleted file mode 100644
index 123909cdf8f..00000000000
--- a/meta/recipes-bsp/grub/files/0001-Revert-configure-Check-linker-for-image-base-support.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 3a9d2dd2f5fb07b75a74c307d61b9b9fc5d20a62 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Fri, 27 Feb 2026 11:46:54 +0800
-Subject: [PATCH] Revert "configure: Check linker for --image-base support"
-
-This reverts commit 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- acinclude.m4 | 5 -----
- configure.ac | 14 ++------------
- 2 files changed, 2 insertions(+), 17 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 70c1912f8..fa7840f09 100644
---- a/acinclude.m4
-+++ b/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)
-diff --git a/configure.ac b/configure.ac
-index d8ca1b7c1..041cfbab4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_c
- 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
-
-@@ -1798,18 +1800,6 @@ grub_PROG_TARGET_CC
- 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
---
-2.43.0
-
diff --git a/meta/recipes-bsp/grub/files/0002-Revert-configure-Print-a-more-helpful-error-if-autoc.patch b/meta/recipes-bsp/grub/files/0002-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
deleted file mode 100644
index bf6375246ed..00000000000
--- a/meta/recipes-bsp/grub/files/0002-Revert-configure-Print-a-more-helpful-error-if-autoc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d0f516385dc73e8dd92b78ce08c1df100434fe67 Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Fri, 27 Feb 2026 13:58:44 +0800
-Subject: [PATCH] Revert "configure: Print a more helpful error if
- autoconf-archive is not installed"
-
-This reverts commit ac042f3f58d33ce9cd5ff61750f06da1a1d7b0eb.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 041cfbab4..209c0fb11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1794,11 +1794,6 @@ 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
- grub_PROG_OBJCOPY_ABSOLUTE
- fi
---
-2.43.0
-
diff --git a/meta/recipes-bsp/grub/files/0003-grub.d-10_linux.in-add-oe-s-kernel-name.patch b/meta/recipes-bsp/grub/files/0003-grub.d-10_linux.in-add-oe-s-kernel-name.patch
index 2bb0aca5cfe..146c2deca30 100644
--- a/meta/recipes-bsp/grub/files/0003-grub.d-10_linux.in-add-oe-s-kernel-name.patch
+++ b/meta/recipes-bsp/grub/files/0003-grub.d-10_linux.in-add-oe-s-kernel-name.patch
@@ -22,7 +22,7 @@ diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 07649cd..d5ec745 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
-@@ -166,12 +166,12 @@ machine=`uname -m`
+@@ -179,12 +179,12 @@ machine=`uname -m`
case "x$machine" in
xi?86 | xx86_64)
list=
@@ -42,7 +42,7 @@ diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 27bff00..6cc7bfc 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
-@@ -181,7 +181,7 @@ EOF
+@@ -184,7 +184,7 @@ EOF
}
linux_list=
diff --git a/meta/recipes-bsp/grub/grub-efi_2.14.bb b/meta/recipes-bsp/grub/grub-efi_2.16.bb
similarity index 100%
rename from meta/recipes-bsp/grub/grub-efi_2.14.bb
rename to meta/recipes-bsp/grub/grub-efi_2.16.bb
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index d0f737164f7..4ead0a3b6a8 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -13,15 +13,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
CVE_PRODUCT = "grub2"
-SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \
+SRC_URI = "https://gitlab.freedesktop.org/api/v4/projects/26558/packages/generic/source-assets/grub-${PV}/grub-${PV}.tar.xz \
file://0001-autogen.sh-exclude-.pc-from-po-POTFILES.in.patch \
file://0002-grub-module-explicitly-keeps-symbole-.module_license.patch \
file://0003-grub.d-10_linux.in-add-oe-s-kernel-name.patch \
- file://0001-Revert-configure-Check-linker-for-image-base-support.patch \
- file://0002-Revert-configure-Print-a-more-helpful-error-if-autoc.patch \
"
-SRC_URI[sha256sum] = "d0415fbb3e739237064e173743a6e5f60c33a81ec02a069cc9152d80efff4967"
+SRC_URI[sha256sum] = "f0db0104927df0b9a48bc41b735c702936190d17eb2d73d3018fa77474a0cabe"
UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/gnu-grub/grub/-/tags"
UPSTREAM_CHECK_REGEX = "grub-(?P<pver>\d+(\.\d+)+)"
@@ -31,12 +29,6 @@ CVE_STATUS[CVE-2023-4001] = "not-applicable-platform: Applies only to RHEL/Fedo
CVE_STATUS[CVE-2024-1048] = "not-applicable-platform: Applies only to RHEL/Fedora"
CVE_STATUS[CVE-2024-2312] = "not-applicable-platform: Applies only to Ubuntu"
CVE_STATUS[CVE-2024-49504] = "not-applicable-platform: Applies only to SUSE"
-CVE_STATUS[CVE-2025-54770] = "fixed-version: fixed since 2.14"
-CVE_STATUS[CVE-2025-54771] = "fixed-version: fixed since 2.14"
-CVE_STATUS[CVE-2025-61661] = "fixed-version: fixed since 2.14"
-CVE_STATUS[CVE-2025-61662] = "fixed-version: fixed since 2.14"
-CVE_STATUS[CVE-2025-61663] = "fixed-version: fixed since 2.14"
-CVE_STATUS[CVE-2025-61664] = "fixed-version: fixed since 2.14"
DEPENDS = "flex-native bison-native gettext-native gawk-replacement-native"
diff --git a/meta/recipes-bsp/grub/grub_2.14.bb b/meta/recipes-bsp/grub/grub_2.16.bb
similarity index 100%
rename from meta/recipes-bsp/grub/grub_2.14.bb
rename to meta/recipes-bsp/grub/grub_2.16.bb
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [OE-core] [PATCH 1/2] grub: update upstream-check
2026-11-16 22:49 [PATCH 1/2] grub: update upstream-check Peter Marko
2026-11-16 22:49 ` [PATCH 2/2] grub: upgrade 2.14 -> 2.16 Peter Marko
@ 2026-11-17 18:42 ` Mathieu Dubois-Briand
2026-11-17 20:53 ` Marko, Peter
1 sibling, 1 reply; 6+ messages in thread
From: Mathieu Dubois-Briand @ 2026-11-17 18:42 UTC (permalink / raw)
To: peter.marko, openembedded-core; +Cc: Ross Burton, Jon Mason
On Mon Nov 16, 2026 at 11:49 PM CET, Peter Marko via openembedded-core wrote:
> From: Peter Marko <peter.marko@siemens.com>
>
> Repository has moved, see [1].
> Old location does not contain new releases anymore.
>
> [1] https://www.phoronix.com/news/GNU-GRUB-To-FreeDesktop
>
> Signed-off-by: Peter Marko <peter.marko@siemens.com>
> ---
Hi Peter,
Thanks for your patches. It looks like this is breaking meta-arm builds.
Technically, this does not prevent from merging it into
openembedded-core, yet I'm a bit surprised by that.
If any of you has an idea of why qemu is failing here, I'd be happy to
hear about it. The QEMU boot log just contains what looks like a few
aborted boots:
NOTICE: Booting Trusted Firmware
NOTICE: BL1: v2.14.9(release):lts-v2.14.9-dirty
NOTICE: BL1: Built : 06:59:21, Sep 25 2026
NOTICE: BL1: Booting BL2
NOTICE: BL2: v2.14.9(release):lts-v2.14.9-dirty
NOTICE: BL2: Built : 06:59:21, Sep 25 2026
NOTICE: BL1: Booting BL31
NOTICE: BL31: v2.14.9(release):lts-v2.14.9-dirty
NOTICE: BL31: Built : 06:59:21, Sep 25 2026
UEFI firmware (version 1.0 built at 06:19:29 on Sep 22 2026)
ESC[2JESC[004DESC[=3hESC[2JESC[009DNOTICE: Booting Trusted Firmware
NOTICE: BL1: v2.14.9(release):lts-v2.14.9-dirty
NOTICE: BL1: Built : 06:59:21, Sep 25 2026
...
(the whole boot sequence is repeated 5 times)
https://autobuilder.yoctoproject.org/valkyrie/#/builders/75/builds/4883
Thanks,
Mathieu
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread