From f84221d16966fbd9d67d77d4c9d1b06cef68e6c5 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 24 Apr 2024 13:25:05 +0300 Subject: [PATCH] grub2-2.12 --- system/boot/grub2/actions.py | 2 +- system/boot/grub2/files/b835601c.patch | 40 +++++++++++++++++++ system/boot/grub2/files/grub-defaults | 2 +- system/boot/grub2/files/mkconfig-fix.patch | 21 +++++----- .../files/pisi_name_and_initramfs_2.patch | 29 ++++++++++++++ system/boot/grub2/files/update-grub | 1 - system/boot/grub2/pspec.xml | 28 ++++++++----- 7 files changed, 99 insertions(+), 24 deletions(-) create mode 100644 system/boot/grub2/files/b835601c.patch create mode 100644 system/boot/grub2/files/pisi_name_and_initramfs_2.patch diff --git a/system/boot/grub2/actions.py b/system/boot/grub2/actions.py index 5c17074b..d7d22389 100644 --- a/system/boot/grub2/actions.py +++ b/system/boot/grub2/actions.py @@ -14,7 +14,7 @@ from pisi.actionsapi import shelltools def setup(): shelltools.copy("../unifont*.bdf", "./unifont.bdf") - #shelltools.export("GRUB_CONTRIB", "%s/grub-2.06/grub-extras" % (get.workDIR())) + # shelltools.export("GRUB_CONTRIB", "%s/grub-2.06/grub-extras" % (get.workDIR())) pisitools.cflags.remove("-fstack-protector", "-fasynchronous-unwind-tables", "-fexceptions", "-fPIC") pisitools.cflags.sub("\s?(-O[\ds]|-D_FORTIFY_SOURCE=\d)\s?", " ") diff --git a/system/boot/grub2/files/b835601c.patch b/system/boot/grub2/files/b835601c.patch new file mode 100644 index 00000000..8b0af300 --- /dev/null +++ b/system/boot/grub2/files/b835601c.patch @@ -0,0 +1,40 @@ +From b835601c7639ed1890f2d3db91900a8506011a8e Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen +Date: Thu, 21 Dec 2023 01:17:35 -0600 +Subject: build: Include grub-core/extra_deps.lst in dist + +Fixes build failure due to the extra_deps.lst file not existing in the +tarball. Found while trying to package GRUB 2.12 for Gentoo. + + make[3]: *** No rule to make target '/var/tmp/portage/sys-boot/grub-2.12/work/grub-2.12/grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop. + +Fixes: 89fbe0cac (grub-core/Makefile.am: Make path to extra_deps.lst relative to $(top_srcdir)/grub-core) +Fixes: 154dcb1ae (build: Allow explicit module dependencies) + +Signed-off-by: Oskari Pirhonen +Reviewed-by: Daniel Kiper +--- + conf/Makefile.extra-dist | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist +index 5e7126f..d9e2b8c 100644 +--- a/conf/Makefile.extra-dist ++++ b/conf/Makefile.extra-dist +@@ -21,6 +21,7 @@ EXTRA_DIST += conf/i386-cygwin-img-ld.sc + EXTRA_DIST += grub-core/Makefile.core.def + EXTRA_DIST += grub-core/Makefile.gcry.def + ++EXTRA_DIST += grub-core/extra_deps.lst + EXTRA_DIST += grub-core/genmoddep.awk + EXTRA_DIST += grub-core/genmod.sh.in + EXTRA_DIST += grub-core/gensyminfo.sh.in +-- +cgit v1.1 + +diff -Nuar a/grub-core/extra_deps.lst b/grub-core/extra_deps.lst +--- a/grub-core/extra_deps.lst 1970-01-01 02:00:00.000000000 +0200 ++++ b/grub-core/extra_deps.lst 2023-12-22 18:07:36.000000000 +0300 +@@ -0,0 +1 @@ ++depends bli part_gpt + diff --git a/system/boot/grub2/files/grub-defaults b/system/boot/grub2/files/grub-defaults index 6ef8d48a..3f7e1c41 100644 --- a/system/boot/grub2/files/grub-defaults +++ b/system/boot/grub2/files/grub-defaults @@ -45,7 +45,7 @@ GRUB_COLOR_HIGHLIGHT="black/white" # Uncomment one of them for the gfx desired, a image background or a gfxtheme #GRUB_THEME="/path/to/gfxtheme" #Possible locations -GRUB_THEME="/usr/share/grub/themes/Pisilinux2.4-Grub2-Themes-1/theme.txt" +GRUB_THEME="/usr/share/grub/themes/pisilinux/theme.txt" #GRUB_THEME="/boot/grub/themes/Pisilinux-Bluez/theme.txt" # Uncomment to get a beep at GRUB start #GRUB_INIT_TUNE="480 440 1" diff --git a/system/boot/grub2/files/mkconfig-fix.patch b/system/boot/grub2/files/mkconfig-fix.patch index bfe3fb2f..bf6d9663 100644 --- a/system/boot/grub2/files/mkconfig-fix.patch +++ b/system/boot/grub2/files/mkconfig-fix.patch @@ -7,22 +7,24 @@ Subject: [PATCH] 00_header: add GRUB_COLOR_* variables util/grub.d/00_header.in | 8 ++++++++ 2 files changed, 10 insertions(+) -diff -Nuar a/util/grub-mkconfig.in b/util/grub-mkconfig.in ---- a/util/grub-mkconfig.in 2021-11-05 18:53:16.118969000 +0300 -+++ b/util/grub-mkconfig.in 2021-11-05 20:03:25.603871159 +0300 -@@ -243,6 +243,8 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index f8cbb8d7a..1189d95f9 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -246,6 +246,8 @@ export GRUB_DEFAULT \ GRUB_BACKGROUND \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ + GRUB_COLOR_NORMAL \ + GRUB_COLOR_HIGHLIGHT \ - GRUB_DISABLE_OS_PROBER \ GRUB_INIT_TUNE \ GRUB_SAVEDEFAULT \ -diff -Nuar a/util/grub.d/00_header.in b/util/grub.d/00_header.in ---- a/util/grub.d/00_header.in 2021-11-05 18:53:15.816969000 +0300 -+++ b/util/grub.d/00_header.in 2021-11-05 20:06:00.698859968 +0300 -@@ -125,6 +125,14 @@ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 93a90233e..c5955df00 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -125,6 +125,14 @@ cat <app:gui GNU GRUB is a Multiboot boot loader. GNU GRUB (short for GNU GRand Unified Bootloader) is a boot loader package from the GNU Project. - https://ftp.gnu.org/gnu/grub/grub-2.06.tar.xz - - https://ftp.gnu.org/gnu/unifont/unifont-15.1.04/unifont-15.1.04.bdf.gz - - https://github.com/erkanisik1/Pisilinux2.4-Grub2-Themes/archive/refs/tags/V1.tar.gz + https://ftp.gnu.org/gnu/grub/grub-2.12.tar.xz + https://ftp.gnu.org/gnu/unifont/unifont-15.1.05/unifont-15.1.05.bdf.gz + https://github.com/erkanisik1/Pisilinux2.4-Grub2-Themes/archive/refs/tags/V1.tar.gz git autogen-devel @@ -44,12 +42,12 @@ grub - mageia/0001-Fix-fgrep-grep-F-warnings.patch + gfxpayload.patch grub-2.02_beta2-KERNEL_GLOBS.patch grub-mkconfig.patch - pisi_name_and_initramfs.patch + pisi_name_and_initramfs_2.patch grub-2.06-test-words.patch @@ -57,12 +55,12 @@ 0001-Revert-templates-Fix-user-facing-typo-with-an-incorr.patch 0002-Revert-templates-Properly-disable-the-os-prober-by-d.patch 0003-Revert-templates-Disable-the-os-prober-by-default.patch - 0202-templates-Check-for-EFI-at-runtime-instead-of-config.patch - 0203-efi-Print-an-error-if-boot-to-firmware-setup-is-not-.patch + + - 0206-powerpc-adjust-setting-of-prefix-for-signed-binary-c.patch - 0207-powerpc-fix-prefix-signed-grub-special-case-for-Powe.patch + + @@ -73,6 +71,7 @@ + b835601c.patch @@ -113,6 +112,13 @@ + + 2024-04-24 + 2.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2024-04-23 2.06