From 8968675247d24477912b998914af391f64a9ff69 Mon Sep 17 00:00:00 2001 From: Weijie Gao Date: Sun, 7 Jan 2024 03:35:39 +0800 Subject: [PATCH] grub2: update to 2.12 compile tested: x86_64,i386,loongarch64 Signed-off-by: Weijie Gao {Refresh patches} Signed-off-by: Hauke Mehrtens --- package/boot/grub2/Makefile | 6 ++-- .../001-add-missing-extra_deps-list.patch | 31 +++++++++++++++++++ .../grub2/patches/100-grub_setup_root.patch | 6 ++-- 3 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 package/boot/grub2/patches/001-add-missing-extra_deps-list.patch diff --git a/package/boot/grub2/Makefile b/package/boot/grub2/Makefile index f274ce2289..279f2bd3c6 100644 --- a/package/boot/grub2/Makefile +++ b/package/boot/grub2/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=grub -PKG_VERSION:=2.06 -PKG_RELEASE:=6 +PKG_VERSION:=2.12 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/grub -PKG_HASH:=b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 +PKG_HASH:=f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa PKG_LICENSE:=GPL-3.0-or-later PKG_CPE_ID:=cpe:/a:gnu:grub2 diff --git a/package/boot/grub2/patches/001-add-missing-extra_deps-list.patch b/package/boot/grub2/patches/001-add-missing-extra_deps-list.patch new file mode 100644 index 0000000000..820432c4c8 --- /dev/null +++ b/package/boot/grub2/patches/001-add-missing-extra_deps-list.patch @@ -0,0 +1,31 @@ +From 4d4dae6a52b1749642261a15f5dcc1e3d4150b36 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 22 Dec 2023 19:02:53 +0100 +Subject: [PATCH] Add missing grub-core/extra_deps.lst file in release tarball + +A file is missing in the grub-2.12 release tarballs (both .gz and .xz). +See [1]. The issue was reported in [2] and fixed upstream in [3]. + +This patch adds the missing file, on top of the release tarball. This +patch won't apply on upstream git, since the file is present in the +source repository. Since the issue is fixed upstream in [3], it is +expected upcoming releases tarballs will include the file. + +The file content was fetched from the upstream git repo: +https://git.savannah.gnu.org/gitweb/?p=grub.git;a=blob_plain;f=grub-core/extra_deps.lst;hb=refs/tags/grub-2.12 + +[1] https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz +[2] https://lists.gnu.org/archive/html/grub-devel/2023-12/msg00054.html +[3] https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=b835601c7639ed1890f2d3db91900a8506011a8e + +Signed-off-by: Julien Olivain +Upstream: Fixed by: https://git.savannah.gnu.org/gitweb/?p=grub.git;a=commit;h=b835601c7639ed1890f2d3db91900a8506011a8e +--- + grub-core/extra_deps.lst | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 grub-core/extra_deps.lst + +--- /dev/null ++++ b/grub-core/extra_deps.lst +@@ -0,0 +1 @@ ++depends bli part_gpt diff --git a/package/boot/grub2/patches/100-grub_setup_root.patch b/package/boot/grub2/patches/100-grub_setup_root.patch index f20b310e12..bcaa85afdf 100644 --- a/package/boot/grub2/patches/100-grub_setup_root.patch +++ b/package/boot/grub2/patches/100-grub_setup_root.patch @@ -1,6 +1,6 @@ --- a/include/grub/util/install.h +++ b/include/grub/util/install.h -@@ -198,13 +198,13 @@ grub_install_get_image_target (const cha +@@ -199,13 +199,13 @@ grub_install_get_image_target (const cha void grub_util_bios_setup (const char *dir, const char *boot_file, const char *core_file, @@ -18,7 +18,7 @@ --- a/util/grub-install.c +++ b/util/grub-install.c -@@ -1721,7 +1721,7 @@ main (int argc, char *argv[]) +@@ -1770,7 +1770,7 @@ main (int argc, char *argv[]) if (install_bootsector) { grub_util_bios_setup (platdir, "boot.img", "core.img", @@ -27,7 +27,7 @@ fs_probe, allow_floppy, add_rs_codes, !grub_install_is_short_mbrgap_supported ()); -@@ -1752,7 +1752,7 @@ main (int argc, char *argv[]) +@@ -1801,7 +1801,7 @@ main (int argc, char *argv[]) if (install_bootsector) { grub_util_sparc_setup (platdir, "boot.img", "core.img", -- 2.30.2