upgpkg: grub 1:2.02.beta2-5

load intel microcode in 10_linux

git-svn-id: file:///srv/repos/svn-packages/svn@225397 eb2447ed-0c53-47e4-bac8-5bc4a241df78

3 files changed, 36 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79225c828e5a..4af7aff6a107 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = grub
 	pkgdesc = GNU GRand Unified Bootloader (2)
 	pkgver = 2.02.beta2
-	pkgrel = 4
+	pkgrel = 5
 	epoch = 1
 	url = https://www.gnu.org/software/grub/
 	install = grub.install
@@ -53,6 +53,7 @@ pkgbase = grub
 	source = http://ftp.gnu.org/gnu/unifont/unifont-6.3.20131217/unifont-6.3.20131217.bdf.gz
 	source = http://ftp.gnu.org/gnu/unifont/unifont-6.3.20131217/unifont-6.3.20131217.bdf.gz.sig
 	source = grub-10_linux-detect-archlinux-initramfs.patch
+	source = grub-intel-ucode.patch
 	source = grub-add-GRUB_COLOR_variables.patch
 	source = 60_memtest86+
 	source = grub.default
@@ -62,6 +63,7 @@ pkgbase = grub
 	md5sums = 728b7439ac733a7c0d56049adec364c7
 	md5sums = SKIP
 	md5sums = 945527e0de8d384166a4cf23439ae9ee
+	md5sums = a678629bc82c4e70c48d28242036d1d7
 	md5sums = e506ae4a9f9f7d1b765febfa84e10d48
 	md5sums = be55eabc102f2c60b38ed35c203686d6
 	md5sums = a03ffd56324520393bf574cefccb893d
diff --git a/PKGBUILD b/PKGBUILD
index 41e8d5579195..87c2b57113bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _UNIFONT_VER="6.3.20131217"
 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 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}
         "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 @@ md5sums=('SKIP'
          '728b7439ac733a7c0d56049adec364c7'
          'SKIP'
          '945527e0de8d384166a4cf23439ae9ee'
+	 'a678629bc82c4e70c48d28242036d1d7'
          'e506ae4a9f9f7d1b765febfa84e10d48'
          'be55eabc102f2c60b38ed35c203686d6'
          'a03ffd56324520393bf574cefccb893d'
@@ -81,6 +83,10 @@ prepare() {
 	
 	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
diff --git a/grub-intel-ucode.patch b/grub-intel-ucode.patch
new file mode 100644
index 000000000000..de6bd288c278
--- /dev/null
+++ b/grub-intel-ucode.patch
@@ -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