[rpms/grub2] rawhide: platform: Return i386-pc when /proc/device-tree is present

[rpms/grub2] rawhide: platform: Return i386-pc when /proc/device-tree is present

[Leo Sandoval]

            A new commit has been pushed.

            Repo   : rpms/grub2
            Branch : rawhide
            Commit : b5f66a45616c59a7a19d6a12dd653cf2e4022847
            Author : Leo Sandoval <lsandova@redhat.com>
            Date   : 2026-09-01T13:39:02-06:00
            Stats  : +41/-1 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/grub2/c/b5f66a45616c59a7a19d6a12dd653cf2e4022847?branch=rawhide

            Log:
            platform: Return i386-pc when /proc/device-tree is present

Resolves: #2523734

Signed-off-by: Leo Sandoval <lsandova@redhat.com>

---
diff --git a/0452-platform-Return-i386-pc-when-proc-device-tree-is-pre.patch b/0452-platform-Return-i386-pc-when-proc-device-tree-is-pre.patch
new file mode 100644
index 0000000..048f805
--- /dev/null
+++ b/0452-platform-Return-i386-pc-when-proc-device-tree-is-pre.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leo Sandoval <lsandova@redhat.com>
+Date: Tue, 1 Sep 2026 13:23:34 -0600
+Subject: [PATCH] platform: Return i386-pc when /proc/device-tree is present
+
+Newer kernels populate /proc/device-tree even on ordinary x86 BIOS
+machines, which made grub_install_get_default_x86_platform() select
+i386-ieee1275. Fedora does not ship that platform, so BIOS installs
+failed. Return i386-pc instead.
+
+Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
+Signed-off-by: Leo Sandoval <lsandova@redhat.com>
+---
+ grub-core/osdep/linux/platform.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
+index e28a79dab..5ade32a01 100644
+--- a/grub-core/osdep/linux/platform.c
++++ b/grub-core/osdep/linux/platform.c
+@@ -144,11 +144,14 @@ grub_install_get_default_x86_platform (void)
+ 	return "i386-efi";
+     }
+ 
++  /* On Fedora the kernel populates /proc/device-tree, but Fedora does not
++     ship i386-ieee1275, so return i386-pc instead.  */
+   grub_util_info ("Looking for /proc/device-tree ..");
+   if (is_not_empty_directory ("/proc/device-tree"))
+     {
+       grub_util_info ("...found");
+-      return "i386-ieee1275";
++      grub_util_info ("Fedora does not support i386-ieee1275, return i386-pc instead");
++      return "i386-pc";
+     }
+ 
+   grub_util_info ("... not found");

diff --git a/grub.patches b/grub.patches
index 7c86e08..302aa87 100644
--- a/grub.patches
+++ b/grub.patches
@@ -443,3 +443,4 @@ Patch0448: 0448-bli-Allow-overriding-PACKAGE_STRING-via-grub-mkimage.patch
 Patch0449: 0449-Revert-Use-medany-instead-of-large-model-for-RISCV.patch
 Patch0450: 0450-configure-Add-mno-relax-on-riscv.patch
 Patch0451: 0451-configure-Defer-check-for-mcmodel-large-until-PIC-PI.patch
+Patch0452: 0452-platform-Return-i386-pc-when-proc-device-tree-is-pre.patch
\ No newline at end of file

diff --git a/grub2.spec b/grub2.spec
index 3a58c92..7ba745a 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.12
-Release:	78%{?dist}
+Release:	79%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPL-3.0-or-later
 URL:		http://www.gnu.org/software/grub/
@@ -702,6 +702,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep 01 2026 Leo Sandoval <lsandova@redhat.com> - 2.12-79
+- platform: Return i386-pc when /proc/device-tree is present
+
 * Thu Aug 20 2026 Andrea Bolognani <abologna@redhat.com> - 2.12-78
 - Use large code model on riscv64