diff --git a/grub2-use-rpmsort-for-version-sorting.patch b/grub2-use-rpmsort-for-version-sorting.patch index acce2da..d227cf6 100644 --- a/grub2-use-rpmsort-for-version-sorting.patch +++ b/grub2-use-rpmsort-for-version-sorting.patch @@ -1,12 +1,28 @@ -diff -urN grub-2.02~beta2.old/util/grub-mkconfig_lib.in grub-2.02~beta2/util/grub-mkconfig_lib.in ---- grub-2.02~beta2.old/util/grub-mkconfig_lib.in 2014-04-11 15:20:42.451394845 +0200 -+++ grub-2.02~beta2/util/grub-mkconfig_lib.in 2014-04-11 15:58:02.940618803 +0200 -@@ -229,7 +229,7 @@ +v2: +Fix wrong sorting order if version contains "-" delimiter + +Index: grub-2.06/util/grub-mkconfig_lib.in +=================================================================== +--- grub-2.06.orig/util/grub-mkconfig_lib.in ++++ grub-2.06/util/grub-mkconfig_lib.in +@@ -220,9 +220,9 @@ version_sort () + + version_test_numeric () + { +- version_test_numeric_a="$1" ++ version_test_numeric_a="`echo "$1" | sed -e 's/-\([^0-9]*\)$/\.\1/' -e 's/-/~/g' -e 's/~\([^~]*\)$/-\1/'`" + version_test_numeric_cmp="$2" +- version_test_numeric_b="$3" ++ version_test_numeric_b="`echo "$3" | sed -e 's/-\([^0-9]*\)$/\.\1/' -e 's/-/~/g' -e 's/~\([^~]*\)$/-\1/'`" + if [ "$version_test_numeric_a" = "$version_test_numeric_b" ] ; then + case "$version_test_numeric_cmp" in + ge|eq|le) return 0 ;; +@@ -234,7 +234,7 @@ version_test_numeric () 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 -+ if [ "`printf '%s\n' "$version_test_gt_a" "$version_test_gt_b" | /usr/lib/rpm/rpmsort -r | head -n1`" = "$version_test_gt_a" ] ; then ++ if [ "`printf '%s\n' "$version_test_numeric_a" "$version_test_numeric_b" | /usr/lib/rpm/rpmsort -r | head -n1`" = "$version_test_numeric_a" ] ; then return 0 else return 1 diff --git a/grub2.changes b/grub2.changes index ea78d6f..a4e16ae 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 25 03:46:55 UTC 2022 - Michael Chang + +- Fix wrong order in kernel sorting of listing rc before final release + (bsc#1197376) + ------------------------------------------------------------------- Fri Mar 18 09:10:07 UTC 2022 - Michael Chang