mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From e84a66eb07c96db182d57f4d40ff7c607a0e5296 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 4 Sep 2014 15:52:08 -0400
|
|
Subject: [PATCH 122/206] Minimize the sort ordering for .debug and -rescue-
|
|
kernels.
|
|
|
|
Resolves: rhbz#1065360
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
util/grub-mkconfig_lib.in | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
|
|
index cf35e417470..10fabee5e14 100644
|
|
--- a/util/grub-mkconfig_lib.in
|
|
+++ b/util/grub-mkconfig_lib.in
|
|
@@ -248,6 +248,14 @@ version_test_gt ()
|
|
*.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 ;;
|
|
+ *-rescue*:*-rescue*) ;;
|
|
+ *?debug:*?debug) ;;
|
|
+ *-rescue*:*?debug) return 1 ;;
|
|
+ *?debug:*-rescue*) return 0 ;;
|
|
+ *-rescue*:*) return 1 ;;
|
|
+ *:*-rescue*) return 0 ;;
|
|
+ *?debug:*) return 1 ;;
|
|
+ *:*?debug) return 0 ;;
|
|
esac
|
|
version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
|
|
return "$?"
|
|
--
|
|
2.15.0
|
|
|