commit dc5d504b930340b33725b38cc8bb8dd3d7fc80d2 Author: Matt Housh <jaeger@crux.ninja> Date: Wed Dec 27 18:30:01 2023 -0600 grub2: updated to version 2.12 diff --git a/grub2/.footprint b/grub2/.footprint index 6f86a0107..b903ce0b8 100644 --- a/grub2/.footprint +++ b/grub2/.footprint @@ -5,6 +5,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 @@ -230,6 +231,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 @@ -242,7 +244,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 @@ -429,6 +430,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/grub2/.signature b/grub2/.signature index 25c6c7f32..6ea53286e 100644 --- a/grub2/.signature +++ b/grub2/.signature @@ -1,9 +1,10 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YHPe8LUbbA7SqWOEIjfvH0YJey/aStyX/huITXu8SvvlTWpwGz4CC2M5d+ZhvG+hGmCQptElTmGhJWYsDAwZAI= -SHA256 (Pkgfile) = 9209bb29c8fd3819c099cff7366282bea5423dda0955e7b113e1bbd3f62ca219 -SHA256 (.footprint) = 968205938dd7d408b4b7b1033647df6f21f53b67c27347013fc7f74c5eded913 -SHA256 (grub-2.06.tar.xz) = b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 +RWSE3ohX2g5d/RDHJZwvCzSIkXwK7HsqbamupqsP+LMvtpxPk5zvhGOhnJ5kugY0EeLclOpHJ41/iZjfIVeQoH24fQUGGqlC1gU= +SHA256 (Pkgfile) = 6375e5e8d6ac357921d5a18b0424fbf2ee217ca01338c933c849c1e11b1f15dd +SHA256 (.footprint) = 3a4f8eb6fee1424f83d080eab86d45584e8551006dbf3ea4951a098c5fbc2cae +SHA256 (grub-2.12.tar.xz) = f3c97391f7c4eaa677a78e090c7e97e6dc47b16f655f04683ebd37bef7fe0faa SHA256 (unifont-9.0.06.pcf.gz) = 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 -SHA256 (grub2-tweaks.diff) = 7b1b96a5d0d97bf671b34e3ab12e88a95ed343cbf7a548209b32bc86b4aeba39 +SHA256 (grub2-tweaks.diff) = 11261ece2e7025eecaf1c2d7145bdb1caaccd813104dd19c0b3301c95f51c59b SHA256 (grub.cfg.sample) = c2e72228c1dd150f727e8d611d6f14956080ce078651b03eb14fcf65b0917dda SHA256 (csum_seed.diff) = ec7b142af05f0bdf3b923e0f3c365592760fc9c10896e9a23899f96e59ad5bfb +SHA256 (extra_deps.lst) = 78d83a1c8ed69220853ac90114e0c7ea13fda00fbe6c81b1fedb1296479e62b4 diff --git a/grub2/Pkgfile b/grub2/Pkgfile index a9ef3ecf0..164b7bfbd 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -4,18 +4,20 @@ # Depends on: libdevmapper freetype python3 name=grub2 -version=2.06 -release=5 +version=2.12 +release=1 source=(http://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \ http://jaeger.morpheus.net/linux/crux/files/unifont-9.0.06.pcf.gz \ - $name-tweaks.diff grub.cfg.sample csum_seed.diff) + $name-tweaks.diff grub.cfg.sample csum_seed.diff extra_deps.lst) build() { export CFLAGS="${CFLAGS} -Wno-error -Os" export PYTHON=python3 cd grub-$version patch -p1 -i $SRC/$name-tweaks.diff - patch -p1 -i $SRC/csum_seed.diff + #patch -p1 -i $SRC/csum_seed.diff + + cp $SRC/extra_deps.lst grub-core/ ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/grub2/extra_deps.lst b/grub2/extra_deps.lst new file mode 100644 index 000000000..f44ad6a0c --- /dev/null +++ b/grub2/extra_deps.lst @@ -0,0 +1 @@ +depends bli part_gpt diff --git a/grub2/grub2-tweaks.diff b/grub2/grub2-tweaks.diff index f818f0a88..55ba2cd8f 100644 --- a/grub2/grub2-tweaks.diff +++ b/grub2/grub2-tweaks.diff @@ -1,6 +1,6 @@ -diff -urN grub-2.06.orig/util/grub.d/00_header.in grub-2.06/util/grub.d/00_header.in ---- grub-2.06.orig/util/grub.d/00_header.in 2018-11-24 11:13:02.000000000 -0600 -+++ grub-2.06/util/grub.d/00_header.in 2023-01-20 20:18:25.323977639 -0600 +diff -urN grub-2.12.orig/util/grub.d/00_header.in grub-2.12/util/grub.d/00_header.in +--- grub-2.12.orig/util/grub.d/00_header.in 2022-10-04 14:58:22.000000000 +0000 ++++ grub-2.12/util/grub.d/00_header.in 2023-12-21 19:19:03.142352196 +0000 @@ -152,7 +152,7 @@ if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then EOF @@ -10,65 +10,16 @@ diff -urN grub-2.06.orig/util/grub.d/00_header.in grub-2.06/util/grub.d/00_heade for basename in unicode unifont ascii; do path="${dir}/${basename}.pf2" if is_path_readable_by_grub "${path}" > /dev/null ; then -diff -urN grub-2.06.orig/util/grub.d/10_hurd.in grub-2.06/util/grub.d/10_hurd.in ---- grub-2.06.orig/util/grub.d/10_hurd.in 2019-10-21 07:02:43.000000000 -0500 -+++ grub-2.06/util/grub.d/10_hurd.in 2023-01-20 20:20:15.763433153 -0600 -@@ -176,7 +176,7 @@ - hurd_entry "$kernel" advanced - hurd_entry "$kernel" recovery - -- kernels=`echo $kernels | tr ' ' '\n' | fgrep -vx "$kernel" | tr '\n' ' '` -+ kernels=`echo $kernels | tr ' ' '\n' | grep -Fvx "$kernel" | tr '\n' ' '` - done - - # If at least one kernel was found, then we need to -diff -urN grub-2.06.orig/util/grub.d/10_kfreebsd.in grub-2.06/util/grub.d/10_kfreebsd.in ---- grub-2.06.orig/util/grub.d/10_kfreebsd.in 2019-10-21 07:02:43.000000000 -0500 -+++ grub-2.06/util/grub.d/10_kfreebsd.in 2023-01-20 20:20:21.670249001 -0600 -@@ -239,7 +239,7 @@ - kfreebsd_entry "${OS}" "${version}" recovery "-s" - fi - -- list=`echo $list | tr ' ' '\n' | fgrep -vx "$kfreebsd" | tr '\n' ' '` -+ list=`echo $list | tr ' ' '\n' | grep -Fvx "$kfreebsd" | tr '\n' ' '` - done - - # If at least one kernel was found, then we need to -diff -urN grub-2.06.orig/util/grub.d/10_linux.in grub-2.06/util/grub.d/10_linux.in ---- grub-2.06.orig/util/grub.d/10_linux.in 2020-12-22 17:24:17.000000000 -0600 -+++ grub-2.06/util/grub.d/10_linux.in 2023-01-20 20:19:01.471557011 -0600 -@@ -213,6 +213,7 @@ - initrd_real= - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ -+ "initramfs-${version}.gz" \ +diff -urN grub-2.12.orig/util/grub.d/10_linux.in grub-2.12/util/grub.d/10_linux.in +--- grub-2.12.orig/util/grub.d/10_linux.in 2022-12-07 13:47:11.000000000 +0000 ++++ grub-2.12/util/grub.d/10_linux.in 2023-12-21 19:21:16.004258494 +0000 +@@ -226,7 +226,8 @@ + for i in "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${alt_version}.img.old" "initrd-${version}.gz" \ + "initrd-${alt_version}.gz.old" "initrd-${version}" \ +- "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \ ++ "initramfs-${version}.img" "initramfs-${version}.gz" \ ++ "initramfs-${alt_version}.img.old" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ "initramfs-genkernel-${version}" \ -@@ -290,7 +291,7 @@ - "single ${GRUB_CMDLINE_LINUX}" - fi - -- list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` -+ list=`echo $list | tr ' ' '\n' | grep -Fvx "$linux" | tr '\n' ' '` - done - - # If at least one kernel was found, then we need to -diff -urN grub-2.06.orig/util/grub.d/20_linux_xen.in grub-2.06/util/grub.d/20_linux_xen.in ---- grub-2.06.orig/util/grub.d/20_linux_xen.in 2020-12-22 17:24:17.000000000 -0600 -+++ grub-2.06/util/grub.d/20_linux_xen.in 2023-01-20 20:19:11.451809007 -0600 -@@ -346,12 +346,12 @@ - "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" - fi - -- list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` -+ list=`echo $list | tr ' ' '\n' | grep -Fvx "$linux" | tr '\n' ' '` - done - if [ x"$is_top_level" != xtrue ]; then - echo ' }' - fi -- xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '` -+ xen_list=`echo $xen_list | tr ' ' '\n' | grep -Fvx "$current_xen" | tr '\n' ' '` - done - - # If at least one kernel was found, then we need to