rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 230153 from Base:System

Browse Source 
- Fix sorting of RC kernels to be older than first regular of the
  series. Fixes bnc#827531.
- added patches:
  * grub2-use-rpmsort-for-version-sorting.patch (forwarded request 230152 from scarabeus_iv)

OBS-URL: https://build.opensuse.org/request/show/230153
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=90
This commit is contained in:
Stephan Kulow 2014-04-26 09:44:56 +00:00 committed by Git OBS Bridge
commit 00947122e9
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
grub2-use-rpmsort-for-version-sorting.patch Normal file
View File

@ -0,0 +1,12 @@
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 @@
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
return 0
else
return 1

9
grub2.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Apr 15 08:36:46 UTC 2014 - tchvatal@suse.com
- Fix sorting of RC kernels to be older than first regular of the
series. Fixes bnc#827531.
- added patches:
* grub2-use-rpmsort-for-version-sorting.patch
-------------------------------------------------------------------
Thu Apr 10 16:35:08 UTC 2014 - dvaleev@suse.com

2
grub2.spec
View File

@ -139,6 +139,7 @@ Patch35: grub2-linguas.sh-no-rsync.patch
Patch36: 0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
Patch37: grub2-use-Unifont-for-starfield-theme-terminal.patch
Patch38: grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
Patch39: grub2-use-rpmsort-for-version-sorting.patch
# Btrfs snapshot booting related patches
Patch101: 0002-btrfs-add-ability-to-boot-from-subvolumes.patch
Patch102: 0003-cmdline-add-envvar-loader_cmdline_append.patch
@ -329,6 +330,7 @@ mv po/grub.pot po/%{name}.pot
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1