Accepting request 249867 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/249867 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=100
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
d3c045b78e
@ -28,8 +28,8 @@ Index: grub-2.02~beta2/grub-core/osdep/unix/config.c
|
||||
|
||||
- strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\n\", "
|
||||
- "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\"");
|
||||
+ strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\nSUSE_BTRFS_SNAPSHOT_BOOTING=%s\\n\", "
|
||||
+ "\"$GRUB_ENABLE_CRYPTODISK\", \"$GRUB_DISTRIBUTOR\", \"$SUSE_BTRFS_SNAPSHOT_BOOTING\"");
|
||||
+ strcpy (ptr, "'; printf \"GRUB_ENABLE_CRYPTODISK=%s\\nGRUB_DISTRIBUTOR=%s\\nSUSE_BTRFS_SNAPSHOT_BOOTING=%s\\n\" "
|
||||
+ "\"$GRUB_ENABLE_CRYPTODISK\" \"$GRUB_DISTRIBUTOR\" \"$SUSE_BTRFS_SNAPSHOT_BOOTING\"");
|
||||
|
||||
argv[2] = script;
|
||||
argv[3] = '\0';
|
||||
@ -70,7 +70,7 @@ Index: grub-2.02~beta2/util/grub-install.c
|
||||
===================================================================
|
||||
--- grub-2.02~beta2.orig/util/grub-install.c
|
||||
+++ grub-2.02~beta2/util/grub-install.c
|
||||
@@ -816,6 +816,8 @@ fill_core_services (const char *core_ser
|
||||
@@ -803,6 +803,8 @@ fill_core_services (const char *core_ser
|
||||
free (sysv_plist);
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@ Index: grub-2.02~beta2/util/grub-install.c
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
{
|
||||
@@ -849,6 +851,9 @@ main (int argc, char *argv[])
|
||||
@@ -836,6 +838,9 @@ main (int argc, char *argv[])
|
||||
|
||||
grub_util_load_config (&config);
|
||||
|
||||
@ -89,7 +89,7 @@ Index: grub-2.02~beta2/util/grub-install.c
|
||||
if (!bootloader_id && config.grub_distributor)
|
||||
{
|
||||
char *ptr;
|
||||
@@ -1334,6 +1339,16 @@ main (int argc, char *argv[])
|
||||
@@ -1305,6 +1310,16 @@ main (int argc, char *argv[])
|
||||
fprintf (load_cfg_f, "set debug='%s'\n",
|
||||
debug_image);
|
||||
}
|
||||
|
||||
@ -99,7 +99,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
|
||||
+
|
||||
+ if test "$xen_pv_domU" = "false" ; then
|
||||
+ # prevent xen kernel without pv_opt support from booting
|
||||
+ if (grep -qx "CONFIG_XEN=y" "${config}" 2> /dev/null && grep -qvx "CONFIG_PARAVIRT=y" "${config}" 2> /dev/null); then
|
||||
+ if (grep -qx "CONFIG_XEN=y" "${config}" 2> /dev/null && ! grep -qx "CONFIG_PARAVIRT=y" "${config}" 2> /dev/null); then
|
||||
+ echo "Skip xenlinux kernel $linux" >&2
|
||||
+ list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
|
||||
+ continue
|
||||
|
||||
34
grub2-glibc-2.20.patch
Normal file
34
grub2-glibc-2.20.patch
Normal file
@ -0,0 +1,34 @@
|
||||
* grub-core/kern/emu/hostfs.c: squahes below warning
|
||||
warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE"
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Submitted
|
||||
---
|
||||
grub-core/kern/emu/hostfs.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c
|
||||
index 7e725f6..823116d 100644
|
||||
--- a/grub-core/kern/emu/hostfs.c
|
||||
+++ b/grub-core/kern/emu/hostfs.c
|
||||
@@ -19,7 +19,11 @@
|
||||
|
||||
#include <config-util.h>
|
||||
|
||||
+/* Legacy feature macro.*/
|
||||
#define _BSD_SOURCE
|
||||
+/* New feature macro that provides everything _BSD_SOURCE and
|
||||
+ * _SVID_SOURCE provided and possibly more. */
|
||||
+#define _DEFAULT_SOURCE
|
||||
#include <grub/fs.h>
|
||||
#include <grub/file.h>
|
||||
#include <grub/disk.h>
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
||||
_______________________________________________
|
||||
Grub-devel mailing list
|
||||
Grub-devel@gnu.org
|
||||
https://lists.gnu.org/mailman/listinfo/grub-devel
|
||||
17
grub2-mkconfig-aarch64.patch
Normal file
17
grub2-mkconfig-aarch64.patch
Normal file
@ -0,0 +1,17 @@
|
||||
grub-mkonfig: Look for Image-* on aarch64
|
||||
|
||||
Index: grub-2.02~beta2/util/grub.d/10_linux.in
|
||||
===================================================================
|
||||
--- grub-2.02~beta2.orig/util/grub.d/10_linux.in
|
||||
+++ grub-2.02~beta2/util/grub.d/10_linux.in
|
||||
@@ -168,6 +168,10 @@ case "x$machine" in
|
||||
list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
||||
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||
done` ;;
|
||||
+ xaarch64)
|
||||
+ list=`for i in /boot/Image-* /Image-* /boot/kernel-* ; do
|
||||
+ if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||
+ done` ;;
|
||||
*)
|
||||
list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
||||
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 16 07:08:18 UTC 2014 - schwab@suse.de
|
||||
|
||||
- grub2-mkconfig-aarch64.patch: Look for Image-* instead of vmlinuz-* on
|
||||
aarch64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 15 15:30:03 UTC 2014 - arvidjaar@gmail.com
|
||||
|
||||
- add grub2-glibc-2.20.patch - fix build with glibc 2.20+
|
||||
(use _DEFAULT_SOURCE to avoid warning)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 12 04:14:38 UTC 2014 - mchang@suse.com
|
||||
|
||||
- fix xen pvops kernel not appear on menu (bnc#895286)
|
||||
* refresh grub2-fix-menu-in-xen-host-server.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 10 10:34:47 UTC 2014 - mchang@suse.com
|
||||
|
||||
- fix extraneous comma in printf shell command (bnc#895884)
|
||||
* refresh grub2-btrfs-04-grub2-install.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 27 07:53:35 UTC 2014 - schwab@suse.de
|
||||
|
||||
|
||||
@ -150,6 +150,9 @@ Patch39: grub2-use-rpmsort-for-version-sorting.patch
|
||||
Patch40: aarch64-reloc.patch
|
||||
Patch41: grub2-vbe-blacklist-preferred-1440x900x32.patch
|
||||
Patch42: grub2-btrfs-fix-incorrect-address-reference.patch
|
||||
Patch43: grub2-mkconfig-aarch64.patch
|
||||
# Fix build with glibc 2.20+
|
||||
Patch44: grub2-glibc-2.20.patch
|
||||
# Btrfs snapshot booting related patches
|
||||
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
|
||||
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
|
||||
@ -351,6 +354,8 @@ mv po/grub.pot po/%{name}.pot
|
||||
%patch40 -p1
|
||||
%patch41 -p1
|
||||
%patch42 -p1
|
||||
%patch43 -p1
|
||||
%patch44 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user