grub2-2.12

2024-04-24 13:25:05 +03:00
parent 743e0b562d
commit f84221d169
7 changed files with 99 additions and 24 deletions
@@ -0,0 +1,40 @@
+From b835601c7639ed1890f2d3db91900a8506011a8e Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+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 <xxc3ncoredxx@gmail.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ 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
+
@@ -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"
@@ -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 <<EOF

 EOF

@@ -37,4 +39,3 @@ diff -Nuar a/util/grub.d/00_header.in b/util/grub.d/00_header.in
 serial=0;
 gfxterm=0;
 for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
-
@@ -0,0 +1,29 @@
+diff -Nuar a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+--- a/util/grub.d/10_linux.in	2022-12-07 16:47:11.000000000 +0300
+++ b/util/grub.d/10_linux.in	2023-12-23 13:55:45.671987034 +0300
+@@ -29,7 +29,13 @@
+ CLASS="--class gnu-linux --class gnu --class os"
+ 
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+-  OS=GNU/Linux
+   if [ -f "/etc/pisilinux-release" ] ; then
+     OS="$(sed 's, release .*$,,g' /etc/pisilinux-release)"
+   elif [ -e "/etc/system-release" ] ; then
+     OS="$(sed 's, release .*$,,g' /etc/system-release)"
+   else
+     OS=GNU/Linux
+   fi
+ else
+   OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
+@@ -223,7 +229,9 @@
+   done
+
+   initrd_real=
+-  for i in "initrd.img-${version}" "initrd-${version}.img" \
+  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
+       "initrd-${version}" "initramfs-${version}.img" "initramfs-fallback-${version}.img"\
+       "initramfs-${version}.gz" "initramfs-${version}" \
+ 	   "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
+ 	   "initrd-${alt_version}.gz.old" "initrd-${version}" \
+ 	   "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
@@ -1,3 +1,2 @@
 #! /bin/sh
-# export LC_ALL=C
 grub2-mkconfig -o /boot/grub2/grub.cfg