From 5e9c41e4fe56f4886ee120bea0cd6a5f539a3bb0 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Mon, 4 Jun 2012 02:29:21 +0200 Subject: [PATCH] add grub-2.00-ieee1276.patch backport upstream rev 4405 --- grub-2.00-ieee1276.patch | 16 ++++++++++++++++ grub2.spec | 1 + 2 files changed, 17 insertions(+) create mode 100644 grub-2.00-ieee1276.patch diff --git a/grub-2.00-ieee1276.patch b/grub-2.00-ieee1276.patch new file mode 100644 index 00000000..b6378689 --- /dev/null +++ b/grub-2.00-ieee1276.patch @@ -0,0 +1,16 @@ +From: Valdimir Serbinenko +Subject: Check for ieee1275 and not ieee1276. + +upstream rev 4404 + +--- a/util/grub-install.in 2012-05-31 11:38:21 +0000 ++++ b/util/grub-install.in 2012-06-01 20:43:10 +0000 +@@ -738,7 +738,7 @@ + elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "i386-ieee1275" ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "powerpc-ieee1275" ]; then + + # If a install device is defined, copy the core.elf to PReP partition. +- if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "powerpc-ieee1276" ] && [ -n "${install_device}" ]; then ++ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = "powerpc-ieee1275" ] && [ -n "${install_device}" ]; then + if [ "$("${grub_probe}" -m "${device_map}" -d "${install_device}" -t msdos_parttype)" != "41" ]; then + gettext "The chosen partition is not a PReP partition." 1>&2 + echo 1>&2 diff --git a/grub2.spec b/grub2.spec index 25d8dcef..36944cb9 100644 --- a/grub2.spec +++ b/grub2.spec @@ -50,6 +50,7 @@ Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz Source3: README.Fedora Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 +Patch0: grub-2.00-ieee1276.patch Patch2: grub-1.99-just-say-linux.patch Patch5: grub-1.99-ppc-terminfo.patch Patch10: grub-2.00-add-fw_path-search.patch