commit 43066ac32d84d3379ecf3a07e0fd46d529e0621c Author: Matt Housh <jaeger@crux.ninja> Date: Sun Jan 22 23:13:22 2023 -0600 grub2: cleaned up patches, fixed fgrep references diff --git a/grub2/.signature b/grub2/.signature index 603b52de4..70381b2d1 100644 --- a/grub2/.signature +++ b/grub2/.signature @@ -1,9 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Z7OySsAxlT5Bvuw6IXCsCEnZ8/HGbvbdWyPMOXnIREd61KIE8cRhem89U4fdvmooOoSiCWyc0YPS/pNepUoXwg= -SHA256 (Pkgfile) = 0307f7380ce9f17edfd9428e87365e555a69a7031db4e38c79d9fb5e8458690c +RWSE3ohX2g5d/Tugij7l2s9daXoMEGg5Cy3nycSfNulx6n7vTBGMe5cdCBG7Obw12n/Dfde5JQF/Zo34UffGVyH4qiOlEPjsvQ0= +SHA256 (Pkgfile) = fd3e73c60329c5501cf7591a586ab26200666864cb9a063b56e459170f7ffe56 SHA256 (.footprint) = 3dcb92cc7537b4647fada7f2851b521bb7e6bffb6ddaa9110e6572f39dc22d34 SHA256 (grub-2.06.tar.xz) = b79ea44af91b93d17cd3fe80bdae6ed43770678a9a5ae192ccea803ebb657ee1 SHA256 (unifont-9.0.06.pcf.gz) = 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 -SHA256 (grub2-00_header.diff) = e4b30c60aa0fa37d48cad2c4e5a53278f1cd5f4ae2df075f55f7be5fa931f8a7 -SHA256 (grub2-10_linux.diff) = 5621b312a199647909a09e94e710bb4fca1a2be687d61e2ce7a3cf529f09d1ef +SHA256 (grub2-tweaks.diff) = 7b1b96a5d0d97bf671b34e3ab12e88a95ed343cbf7a548209b32bc86b4aeba39 SHA256 (grub.cfg.sample) = c2e72228c1dd150f727e8d611d6f14956080ce078651b03eb14fcf65b0917dda diff --git a/grub2/Pkgfile b/grub2/Pkgfile index 424539bb5..b227ee5e7 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -5,18 +5,16 @@ name=grub2 version=2.06 -release=2 +release=3 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-00_header.diff $name-10_linux.diff grub.cfg.sample) + $name-tweaks.diff grub.cfg.sample) build() { export CFLAGS="${CFLAGS} -Wno-error -Os" export PYTHON=python3 cd grub-$version - - patch -i $SRC/$name-00_header.diff util/grub.d/00_header.in - patch -i $SRC/$name-10_linux.diff util/grub.d/10_linux.in + patch -p1 -i $SRC/$name-tweaks.diff ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/grub2/grub2-00_header.diff b/grub2/grub2-00_header.diff deleted file mode 100644 index 3b8ebb8da..000000000 --- a/grub2/grub2-00_header.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 00_header.in.orig 2015-01-01 16:27:17.433852566 -0600 -+++ 00_header.in 2015-01-01 16:27:28.603852605 -0600 -@@ -142,7 +142,7 @@ - if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then - EOF - else -- for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub ; do -+ for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub /usr/lib/grub/fonts ; do - for basename in unicode unifont ascii; do - path="${dir}/${basename}.pf2" - if is_path_readable_by_grub "${path}" > /dev/null ; then diff --git a/grub2/grub2-10_linux.diff b/grub2/grub2-10_linux.diff deleted file mode 100644 index 6a90cd8dd..000000000 --- a/grub2/grub2-10_linux.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- 10_linux.in.orig 2012-09-05 13:34:26.947842426 -0500 -+++ 10_linux.in 2012-09-05 13:34:55.967842887 -0500 -@@ -193,6 +193,7 @@ - initrd= - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ -+ "initramfs-${version}.gz" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ diff --git a/grub2/grub2-tweaks.diff b/grub2/grub2-tweaks.diff new file mode 100644 index 000000000..f818f0a88 --- /dev/null +++ b/grub2/grub2-tweaks.diff @@ -0,0 +1,74 @@ +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 +@@ -152,7 +152,7 @@ + if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then + EOF + else +- for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub ; do ++ for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub /usr/lib/grub/fonts ; do + 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" \ + "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