mirror of
https://git.proxmox.com/git/grub2
synced 2025-07-25 06:52:53 +00:00
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
Description: Improve handling of Debian kernel version numbers
|
|
Author: Robert Millan <rmh@aybabtu.com>
|
|
Forwarded: not-needed
|
|
Last-Update: 2011-04-21
|
|
|
|
Index: b/util/grub-mkconfig_lib.in
|
|
===================================================================
|
|
--- a/util/grub-mkconfig_lib.in
|
|
+++ b/util/grub-mkconfig_lib.in
|
|
@@ -229,8 +229,9 @@
|
|
|
|
version_test_gt ()
|
|
{
|
|
- version_test_gt_a="`echo "$1" | sed -e "s/[^-]*-//"`"
|
|
- version_test_gt_b="`echo "$2" | sed -e "s/[^-]*-//"`"
|
|
+ version_test_gt_sedexp="s/[^-]*-//;s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g"
|
|
+ version_test_gt_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`"
|
|
+ version_test_gt_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`"
|
|
version_test_gt_cmp=gt
|
|
if [ "x$version_test_gt_b" = "x" ] ; then
|
|
return 0
|
|
@@ -240,7 +241,7 @@
|
|
*.old:*) version_test_gt_a="`echo -n "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
|
|
*:*.old) version_test_gt_b="`echo -n "$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"
|
|
+ dpkg --compare-versions "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
|
|
return "$?"
|
|
}
|
|
|