From 16fbc21a7f96ad4e169380bbce258cd76f73a81f Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 23 Dec 2013 21:31:14 +0000
Subject: [PATCH] Only run /etc/grub.d/30_uefi-firmware for the x86 platform.

---
 debian/changelog                                | 5 +++--
 debian/patches/mkconfig_more_scripts_once.patch | 4 +---
 debian/patches/uefi_firmware_setup.patch        | 8 ++++++--
 util/grub-mkconfig.in                           | 1 -
 util/grub.d/30_uefi-firmware.in                 | 4 ++++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c97e37c15..913bb89a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,9 @@ grub2 (2.02~beta1-1) UNRELEASED; urgency=low
   * Install grub-file in grub-common.
   * Fix crash due to pointer confusion in grub-mkdevicemap, introduced while
     converting away from nested functions in 2.00+20131208-1.
-  * Add more grub.d scripts (05_debian_theme and 30_uefi-firmware) to the
-    list that should be run only once.
+  * Add another grub.d script (05_debian_theme) to the list that should be
+    run only once.
+  * Only run /etc/grub.d/30_uefi-firmware for the x86 platform.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 10 Dec 2013 17:39:47 +0000
 
diff --git a/debian/patches/mkconfig_more_scripts_once.patch b/debian/patches/mkconfig_more_scripts_once.patch
index 0fb8b288e..baa7dcfc0 100644
--- a/debian/patches/mkconfig_more_scripts_once.patch
+++ b/debian/patches/mkconfig_more_scripts_once.patch
@@ -7,13 +7,11 @@ Index: b/util/grub-mkconfig.in
 ===================================================================
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
-@@ -275,7 +275,9 @@
+@@ -275,6 +275,7 @@
  for i in "${grub_mkconfig_dir}"/* ; do
    case "$i" in
        "${grub_mkconfig_dir}"/00_header \
 +      | "${grub_mkconfig_dir}"/05_debian_theme \
        | "${grub_mkconfig_dir}"/30_os-prober \
-+      | "${grub_mkconfig_dir}"/30_uefi-firmware \
        | "${grub_mkconfig_dir}"/40_custom \
        | "${grub_mkconfig_dir}"/41_custom)
- 	      echo
diff --git a/debian/patches/uefi_firmware_setup.patch b/debian/patches/uefi_firmware_setup.patch
index 3b8014173..49effe74d 100644
--- a/debian/patches/uefi_firmware_setup.patch
+++ b/debian/patches/uefi_firmware_setup.patch
@@ -1,7 +1,7 @@
 Description: Output a menu entry for firmware setup on UEFI FastBoot systems
 Author: Steve Langasek <steve.langasek@ubuntu.com>
 Forwarded: no
-Last-Update: 2013-12-20
+Last-Update: 2013-12-23
 
 Index: b/Makefile.util.def
 ===================================================================
@@ -24,7 +24,7 @@ Index: b/util/grub.d/30_uefi-firmware.in
 ===================================================================
 --- /dev/null
 +++ b/util/grub.d/30_uefi-firmware.in
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,50 @@
 +#! /bin/sh
 +set -e
 +
@@ -53,6 +53,10 @@ Index: b/util/grub.d/30_uefi-firmware.in
 +
 +. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 +
++if [ x$GRUB_PLATFORM != xx86 ]; then
++  exit 0
++fi
++
 +efi_vars_dir=/sys/firmware/efi/vars
 +EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
 +OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f935ad0f5..79158e2c9 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -277,7 +277,6 @@ for i in "${grub_mkconfig_dir}"/* ; do
       "${grub_mkconfig_dir}"/00_header \
       | "${grub_mkconfig_dir}"/05_debian_theme \
       | "${grub_mkconfig_dir}"/30_os-prober \
-      | "${grub_mkconfig_dir}"/30_uefi-firmware \
       | "${grub_mkconfig_dir}"/40_custom \
       | "${grub_mkconfig_dir}"/41_custom)
 	      echo
diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
index 0f49bfc07..130d65dd8 100644
--- a/util/grub.d/30_uefi-firmware.in
+++ b/util/grub.d/30_uefi-firmware.in
@@ -26,6 +26,10 @@ export TEXTDOMAINDIR="@localedir@"
 
 . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
 
+if [ x$GRUB_PLATFORM != xx86 ]; then
+  exit 0
+fi
+
 efi_vars_dir=/sys/firmware/efi/vars
 EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
 OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"