enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grub + grub-with-dtb: add back functions removed from mkconfig_lib in recent GRUB versions (2.12)

Browse Source 
- 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
This commit is contained in:
Ricardo Pardini 2023-10-12 12:44:22 +02:00 committed by Igor
parent 8e9ef4b21b
commit 6219927ce9
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/grub.sh
View File

@ -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!"
}

59
packages/blobs/grub/09_linux_with_dtb.sh
View File

@ -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"