[arch-commits] Commit in grub/trunk (PKGBUILD grub-intel-ucode.patch)

[Ronald van Haren]

    Date: Monday, October 27, 2014 @ 21:22:52
  Author: ronald
Revision: 225397

upgpkg: grub 1:2.02.beta2-5

load intel microcode in 10_linux

Added:
  grub/trunk/grub-intel-ucode.patch
Modified:
  grub/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    8 +++++++-
 grub-intel-ucode.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-27 19:29:41 UTC (rev 225396)
+++ PKGBUILD	2014-10-27 20:22:52 UTC (rev 225397)
@@ -22,7 +22,7 @@
 pkgname="grub"
 pkgdesc="GNU GRand Unified Bootloader (2)"
 pkgver=2.02.beta2
-pkgrel=4
+pkgrel=5
 epoch="1"
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
@@ -57,6 +57,7 @@
         "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"
         "http://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz.sig"
         'grub-10_linux-detect-archlinux-initramfs.patch'
+	'grub-intel-ucode.patch'
         'grub-add-GRUB_COLOR_variables.patch'
         '60_memtest86+'
         'grub.default'
@@ -67,6 +68,7 @@
          '728b7439ac733a7c0d56049adec364c7'
          'SKIP'
          '945527e0de8d384166a4cf23439ae9ee'
+	 'a678629bc82c4e70c48d28242036d1d7'
          'e506ae4a9f9f7d1b765febfa84e10d48'
          'be55eabc102f2c60b38ed35c203686d6'
          'a03ffd56324520393bf574cefccb893d'
@@ -81,6 +83,10 @@
 	
 	cd "${srcdir}/grub-${_pkgver}/"
 	
+	msg "Patch to load Intel microcode"
+	patch -Np1 -i "${srcdir}/grub-intel-ucode.patch"
+	echo
+
 	msg "Patch to detect of Arch Linux initramfs images by grub-mkconfig"
 	patch -Np1 -i "${srcdir}/grub-10_linux-detect-archlinux-initramfs.patch"
 	echo

Added: grub-intel-ucode.patch
===================================================================
--- grub-intel-ucode.patch	                        (rev 0)
+++ grub-intel-ucode.patch	2014-10-27 20:22:52 UTC (rev 225397)
@@ -0,0 +1,26 @@
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index d2e2a8f..f67e50f 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -65,6 +65,12 @@ case x"$GRUB_FS" in
+ 	;;
+ esac
+ 
++intel_ucode=
++if test -e "/boot/intel-ucode.img" ; then
++    gettext_printf "Found Intel Microcode image\n" >&2
++    intel_ucode="$(make_system_path_relative_to_its_root /boot/intel-ucode.img)"
++fi
++
+ title_correction_code=
+ 
+ linux_entry ()
+@@ -136,7 +142,7 @@ EOF
+     message="$(gettext_printf "Loading initial ramdisk ...")"
+     sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$message" | grub_quote)'
+-	initrd	${rel_dirname}/${initrd}
++	initrd	${intel_ucode} ${rel_dirname}/${initrd}
+ EOF
+   fi
+   sed "s/^/$submenu_indentation/" << EOF