forked from pool/grub2
88507aed88
- Fix build with gcc 4.7 (needs -fno-strict-aliasing for zfs code). - Fix error in installation to extended partition (bnc#750897) - Added BuildRequires for gnu-unifont OBS-URL: https://build.opensuse.org/request/show/110168 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=30
31 lines
958 B
Diff
31 lines
958 B
Diff
Index: grub-1.99/grub-core/commands/usbtest.c
|
|
===================================================================
|
|
--- grub-1.99.orig/grub-core/commands/usbtest.c
|
|
+++ grub-1.99/grub-core/commands/usbtest.c
|
|
@@ -111,7 +111,7 @@ grub_usb_get_string (grub_usb_device_t d
|
|
static void
|
|
usb_print_str (const char *description, grub_usb_device_t dev, int idx)
|
|
{
|
|
- char *name;
|
|
+ char *name = NULL;
|
|
grub_usb_err_t err;
|
|
/* XXX: LANGID */
|
|
|
|
Index: grub-1.99/conf/Makefile.common
|
|
===================================================================
|
|
--- grub-1.99.orig/conf/Makefile.common
|
|
+++ grub-1.99/conf/Makefile.common
|
|
@@ -11,10 +11,10 @@ if COND_i386_pc
|
|
CFLAGS_PLATFORM += -mrtd -mregparm=3
|
|
endif
|
|
if COND_i386_efi
|
|
- LDFLAGS_PLATFORM = -melf_i386
|
|
+ LDFLAGS_PLATFORM = -Wl,-melf_i386
|
|
endif
|
|
if COND_x86_64_efi
|
|
- LDFLAGS_PLATFORM = -melf_x86_64
|
|
+ LDFLAGS_PLATFORM = -Wl,-melf_x86_64
|
|
endif
|
|
if COND_i386_qemu
|
|
CFLAGS_PLATFORM += -mrtd -mregparm=3
|