b05b350108
- snapper rollback support (fate#317062) * add btrfs_follow_default.patch * add suse_btrfs_grub2_install.sh * add 80_suse_btrfs_snapshot * refresh grub2-snapper-plugin.sh - add grub2-x86_64-xen subpackage (bnc#863821) - ieee1275: check for IBM pseries emulated machine (bnc#869964) - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Build ppc64 as 32bit - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Rename PowerPC patches so it will have architecture in it's name - added patches: * grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch * grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch * grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch * grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch * grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch * grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch * grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch * grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch * grub2-ppc64le-09-Add-powerpc64-types.patch * grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch * grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch * grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch OBS-URL: https://build.opensuse.org/request/show/228323 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=81
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
Index: grub-2.02~beta2/util/mkimage.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/mkimage.c
|
|
+++ grub-2.02~beta2/util/mkimage.c
|
|
@@ -354,13 +354,10 @@ static const struct grub_install_image_t
|
|
{
|
|
.dirname = "powerpc-ieee1275",
|
|
.names = { "powerpc-ieee1275", NULL },
|
|
-
|
|
-#ifdef __powerpc64__
|
|
+#ifdef __powerpc64le__
|
|
.voidp_sizeof = 8,
|
|
- .elf_target = EM_PPC64,
|
|
#else
|
|
.voidp_sizeof = 4,
|
|
- .elf_target = EM_PPC,
|
|
#endif
|
|
|
|
#ifdef __powerpc64le__
|
|
@@ -368,7 +365,6 @@ static const struct grub_install_image_t
|
|
#else
|
|
.bigendian = 1,
|
|
#endif
|
|
-
|
|
.id = IMAGE_PPC,
|
|
.flags = PLATFORM_FLAGS_NONE,
|
|
.total_module_size = TARGET_NO_FIELD,
|
|
@@ -378,6 +374,11 @@ static const struct grub_install_image_t
|
|
.section_align = 1,
|
|
.vaddr_offset = 0,
|
|
.link_addr = GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR,
|
|
+#ifdef __powerpc64le__
|
|
+ .elf_target = EM_PPC64,
|
|
+#else
|
|
+ .elf_target = EM_PPC,
|
|
+#endif
|
|
.mod_gap = GRUB_KERNEL_POWERPC_IEEE1275_MOD_GAP,
|
|
.mod_align = GRUB_KERNEL_POWERPC_IEEE1275_MOD_ALIGN,
|
|
.link_align = 4
|