From 6219927ce988dabb4fdf5bd3a25c020d39c5be93 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Thu, 12 Oct 2023 12:44:22 +0200
Subject: [PATCH] grub + grub-with-dtb: add back functions removed from
 mkconfig_lib in recent GRUB versions (2.12)

- this should make `09_linux_with_dtb.sh` work across all RELEASE's, `sid` and `mantic` included
- extra: if `grub-mkconfig` (`update-grub`) fails, show all involved source files
---
 extensions/grub.sh                       |  8 ++++
 packages/blobs/grub/09_linux_with_dtb.sh | 59 ++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/extensions/grub.sh b/extensions/grub.sh
index 89cfde7e32..dd287012c4 100644
--- a/extensions/grub.sh
+++ b/extensions/grub.sh
@@ -178,6 +178,14 @@ pre_umount_final_image__install_grub() {
 
 	display_alert "Creating GRUB config..." "grub-mkconfig" ""
 	chroot_custom "$chroot_target" update-grub || {
+		display_alert "GRUB grub-mkconfig failed" "update-grub failed; dumping full config" "err"
+
+		declare -a mkconfig_input_files=()
+		mkconfig_input_files+=("${MOUNT}/etc/default/grub")
+		mkconfig_input_files+=("${MOUNT}/etc/default/grub.d/"*) # expands!
+		mkconfig_input_files+=("${MOUNT}/etc/grub.d/"*)         # same for /etc/grub.d; expands!
+		run_tool_batcat "${mkconfig_input_files[@]}"
+
 		exit_with_error "update-grub failed!"
 	}
 
diff --git a/packages/blobs/grub/09_linux_with_dtb.sh b/packages/blobs/grub/09_linux_with_dtb.sh
index b5df7e56d0..51ab7cd97a 100644
--- a/packages/blobs/grub/09_linux_with_dtb.sh
+++ b/packages/blobs/grub/09_linux_with_dtb.sh
@@ -34,6 +34,65 @@ vt_handoff="0"
 
 . "$pkgdatadir/grub-mkconfig_lib"
 
+### <functions from grub-mkconfig_lib that were removed recently, add them back for compatibility>
+version_test_numeric() {
+	version_test_numeric_a="$1"
+	version_test_numeric_cmp="$2"
+	version_test_numeric_b="$3"
+	if [ "$version_test_numeric_a" = "$version_test_numeric_b" ]; then
+		case "$version_test_numeric_cmp" in
+			ge | eq | le) return 0 ;;
+			gt | lt) return 1 ;;
+		esac
+	fi
+	if [ "$version_test_numeric_cmp" = "lt" ]; then
+		version_test_numeric_c="$version_test_numeric_a"
+		version_test_numeric_a="$version_test_numeric_b"
+		version_test_numeric_b="$version_test_numeric_c"
+	fi
+	if (
+		echo "$version_test_numeric_a"
+		echo "$version_test_numeric_b"
+	) | version_sort | head -n 1 | grep -qx "$version_test_numeric_b"; then
+		return 0
+	else
+		return 1
+	fi
+}
+
+version_test_gt() {
+	version_test_gt_a="$(echo "$1" | sed -e "s/[^-]*-//")"
+	version_test_gt_b="$(echo "$2" | sed -e "s/[^-]*-//")"
+	version_test_gt_cmp=gt
+	if [ "x$version_test_gt_b" = "x" ]; then
+		return 0
+	fi
+	case "$version_test_gt_a:$version_test_gt_b" in
+		*.old:*.old) ;;
+		*.old:*)
+			version_test_gt_a="$(echo "$version_test_gt_a" | sed -e 's/\.old$//')"
+			version_test_gt_cmp=gt
+			;;
+		*:*.old)
+			version_test_gt_b="$(echo "$version_test_gt_b" | sed -e 's/\.old$//')"
+			version_test_gt_cmp=ge
+			;;
+	esac
+	version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
+	return "$?"
+}
+
+version_find_latest() {
+	version_find_latest_a=""
+	for i in "$@"; do
+		if version_test_gt "$i" "$version_find_latest_a"; then
+			version_find_latest_a="$i"
+		fi
+	done
+	echo "$version_find_latest_a"
+}
+### </functions from grub-mkconfig_lib that were removed recently, add them back for compatibility>
+
 export TEXTDOMAIN=grub
 export TEXTDOMAINDIR="${datarootdir}/locale"