From 3cf2c6090b368f71a4efc2bc4bd1b98e28f8cd68 Mon Sep 17 00:00:00 2001 From: Luis Date: Tue, 26 Dec 2023 06:59:03 +0000 Subject: [PATCH] grub: upgrade to 2.12 --- main/grub/.checksums | 5 ++--- main/grub/.pkgfiles | 7 +++++-- main/grub/spkgbuild | 29 ++++++++++++----------------- main/grub/venom-multi.patch | 10 ++++++++++ 4 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 main/grub/venom-multi.patch diff --git a/main/grub/.checksums b/main/grub/.checksums index f03886dfc..91347c307 100644 --- a/main/grub/.checksums +++ b/main/grub/.checksums @@ -1,5 +1,4 @@ -da388905710bb4cbfbc7bd7346ff9174 grub-2.06-upstream_fixes-1.patch -cf0fd928b1e5479c8108ee52cb114363 grub-2.06.tar.xz +60c564b1bdc39d8e43b3aab4bc0fb140 grub-2.12.tar.xz 5555ecc4025d7b5cf01709ed7bfe6e5f grub.cfg b4a4d287513091e7e66eca5853101a93 grub.default -78d2b0d53485e16754d17b54837eb3f0 venom-tweaks.patch +3a085024804f65fcfcaf6bef536743ff venom-multi.patch diff --git a/main/grub/.pkgfiles b/main/grub/.pkgfiles index a6c87bafa..e56c56c1e 100644 --- a/main/grub/.pkgfiles +++ b/main/grub/.pkgfiles @@ -1,4 +1,4 @@ -grub-2.06-6 +grub-2.12-1 drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/bash_completion.d/ -rw-r--r-- root/root etc/bash_completion.d/grub @@ -8,6 +8,7 @@ drwxr-xr-x root/root etc/grub.d/ -rwxr-xr-x root/root etc/grub.d/00_header -rwxr-xr-x root/root etc/grub.d/10_linux -rwxr-xr-x root/root etc/grub.d/20_linux_xen +-rwxr-xr-x root/root etc/grub.d/25_bli -rwxr-xr-x root/root etc/grub.d/30_os-prober -rwxr-xr-x root/root etc/grub.d/30_uefi-firmware -rwxr-xr-x root/root etc/grub.d/40_custom @@ -242,6 +243,7 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rw-r--r-- root/root usr/lib/grub/i386-pc/gdb.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gdb.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gdb_grub +-rw-r--r-- root/root usr/lib/grub/i386-pc/gdb_helper.py -rw-r--r-- root/root usr/lib/grub/i386-pc/geli.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/geli.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gettext.mod @@ -254,7 +256,6 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/gfxterm_background.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gfxterm_menu.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gfxterm_menu.module --rw-r--r-- root/root usr/lib/grub/i386-pc/gmodule.pl -rw-r--r-- root/root usr/lib/grub/i386-pc/gptsync.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/gptsync.module -rw-r--r-- root/root usr/lib/grub/i386-pc/gzio.mod @@ -441,6 +442,8 @@ drwxr-xr-x root/root usr/lib/grub/i386-pc/ -rwxr-xr-x root/root usr/lib/grub/i386-pc/pcidump.module -rw-r--r-- root/root usr/lib/grub/i386-pc/pgp.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/pgp.module +-rw-r--r-- root/root usr/lib/grub/i386-pc/plainmount.mod +-rwxr-xr-x root/root usr/lib/grub/i386-pc/plainmount.module -rw-r--r-- root/root usr/lib/grub/i386-pc/plan9.mod -rwxr-xr-x root/root usr/lib/grub/i386-pc/plan9.module -rw-r--r-- root/root usr/lib/grub/i386-pc/play.mod diff --git a/main/grub/spkgbuild b/main/grub/spkgbuild index 404439a52..caea954cb 100755 --- a/main/grub/spkgbuild +++ b/main/grub/spkgbuild @@ -2,34 +2,29 @@ # depends : gettext bash xz fuse2 python3 name=grub -version=2.06 -release=6 +version=2.12 +release=1 backup="etc/default/grub" source="https://ftp.gnu.org/gnu/$name/$name-$version.tar.xz - venom-tweaks.patch + venom-multi.patch grub.default - grub-2.06-upstream_fixes-1.patch grub.cfg" build() { - # workaround for https://savannah.gnu.org/bugs/?60458 - # some more info: https://www.linuxquestions.org/questions/showthread.php?p=6257712 - # grub 2.06 reboots immediately when compiled with -O2, only affects legacy BIOS - export CFLAGS="-march=x86-64 -pipe -Os" - cd $name-$version - # venom fallball and multikernel support - patch -Np1 -i $SRC/venom-tweaks.patch - # Fix an issue causing grub-install to fail when the /boot partition - # (or the root partition if /boot is not a separate partition) - # is created by e2fsprogs-1.47.0 or later: - patch -Np1 -i $SRC/grub-2.06-upstream_fixes-1.patch + # Unset any environment variables which may affect the build + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + + # Venom multikernel support + patch -Np1 -i $SRC/venom-multi.patch + + # Add a file missing from the release tarball + echo depends bli part_gpt > grub-core/extra_deps.lst # Fix os name sed 's|GNU/Linux|Linux|' -i "util/grub.d/10_linux.in" - autoreconf -fv ./configure --prefix=/usr \ --sbindir=/sbin \ --sysconfdir=/etc \ @@ -43,6 +38,6 @@ build() { # Borrow from Arch install -D -m0644 $SRC/grub.default $PKG/etc/default/grub - # liveiso stuff + # Liveiso stuff cp $SRC/grub.cfg $PKG/usr/share/$name } diff --git a/main/grub/venom-multi.patch b/main/grub/venom-multi.patch new file mode 100644 index 000000000..c8e736b5d --- /dev/null +++ b/main/grub/venom-multi.patch @@ -0,0 +1,10 @@ +--- grub-2.12/util/grub.d/10_linux.in-ori 2023-12-22 12:16:58.386810228 +0100 ++++ grub-2.12/util/grub.d/10_linux.in 2023-12-22 12:25:15.381835867 +0100 +@@ -224,6 +224,7 @@ + + initrd_real= + for i in "initrd.img-${version}" "initrd-${version}.img" \ ++ "initrd-venom-*.img" \ + "initrd-${alt_version}.img.old" "initrd-${version}.gz" \ + "initrd-${alt_version}.gz.old" "initrd-${version}" \ + "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \