9bc71d03db
- Merge changes from SLE12 - Do not pass root= when root is on nfs (bnc#894374) * modified grub2-pass-corret-root-for-nfsroot.patch * modified grub2-secureboot-provide-linuxefi-config.patch * modified grub2-secureboot-use-linuxefi-on-uefi.patch - Fix xen pvops kernel not appear on menu (bnc#895286) * modified grub2-fix-menu-in-xen-host-server.patch - Workaround grub2-once (bnc#892358) * added grub2-btrfs-workaround-grub2-once.patch * added grub2-once.service * modified grub2-once - Fix busy-loop and hang while network booting (bnc#870613) * added grub2-netboot-hang.patch - Add warning in grubenv file about editing it directly (bnc#887008) * added grub2-editenv-add-warning-message.patch - Fix broken graphics with efifb on QEMU/KVM and nomodeset (bnc#884558) * added grub2-efi-disable-video-cirrus-and-bochus.patch - Disable video support on Power (bnc#877142) * added grub2-ppc64le-disable-video.patch - Track occupied memory so it can be released on exit (bnc#885026) * added grub2-ppc64le-memory-map.patch - Fix grub.xen config searching path on boot partition (bnc#884828) - Add linux16 and initrd16 to grub.xen (bnc#884830) * added grub2-xen-linux16.patch - VLAN tag support (fate#315753) * added 0001-Add-bootargs-parser-for-open-firmware.patch * added 0002-Add-Virtual-LAN-support.patch - Use chainloader to boot xen.efi under UEFI (bnc#871857) * added grub2-efi-xen-chainload.patch - Use device part of chainloader target, if present (bnc#871857) OBS-URL: https://build.opensuse.org/request/show/295632 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=148
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
Index: grub-2.02~beta2/grub-core/Makefile.core.def
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/grub-core/Makefile.core.def
|
|
+++ grub-2.02~beta2/grub-core/Makefile.core.def
|
|
@@ -1921,13 +1921,13 @@ module = {
|
|
module = {
|
|
name = video_cirrus;
|
|
x86 = video/cirrus.c;
|
|
- enable = x86;
|
|
+ enable = x86_noefi;
|
|
};
|
|
|
|
module = {
|
|
name = video_bochs;
|
|
x86 = video/bochs.c;
|
|
- enable = x86;
|
|
+ enable = x86_noefi;
|
|
};
|
|
|
|
module = {
|
|
Index: grub-2.02~beta2/gentpl.py
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/gentpl.py
|
|
+++ grub-2.02~beta2/gentpl.py
|
|
@@ -80,6 +80,10 @@ GROUPS["fdt"] = [ "arm64_efi", "arm_uboo
|
|
GROUPS["i386_coreboot_multiboot_qemu"] = ["i386_coreboot", "i386_multiboot", "i386_qemu"]
|
|
GROUPS["nopc"] = GRUB_PLATFORMS[:]; GROUPS["nopc"].remove("i386_pc")
|
|
|
|
+# x86 without efi
|
|
+GROUPS["x86_noefi"] = GROUPS["x86"][:]
|
|
+GROUPS["x86_noefi"].remove("i386_efi"); GROUPS["x86_noefi"].remove("x86_64_efi");
|
|
+
|
|
#
|
|
# Create platform => groups reverse map, where groups covering that
|
|
# platform are ordered by their sizes
|