From eaf3d6f308094aca4f87ed111c2580e81b18f269 Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Sun, 27 Sep 2015 15:38:45 -0300
Subject: grub: add
 grub-10_linux-20_linux_xen-{detect-devicetree-dir,detect-parabola-initramfs,rebrand-free-distros}.patch,
 rm grub-10_linux-{detect-parabola-initramfs,rebrand-free-distros}.patch and
 parabola_grub_mkconfig_fixes.patch

---
 libre/grub/PKGBUILD | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'libre/grub/PKGBUILD')

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 4d686cd11..5f801f6f9 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -75,21 +75,24 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#tag=${_GRUB_GIT_TAG}
         "grub-extras::git+git://git.sv.gnu.org/grub-extras.git#branch=master"
         "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-parabola-initramfs.patch'
+        'grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
         'grub-add-GRUB_COLOR_variables.patch'
         '60_memtest86+'
         'grub.default'
-        'grub-10_linux-rebrand-free-distros.patch')
+        'grub-10_linux-20_linux_xen-detect-devicetree-dir.patch'
+        'grub-10_linux-20_linux_xen-rebrand-free-distros.patch')
 
 md5sums=('SKIP'
          'SKIP'
          '728b7439ac733a7c0d56049adec364c7'
          'SKIP'
-         'df4c560c566bf5b21d122990cbc85a38'
+         '55f2290e5768d0d59a3e5f7ad83324bc'
          'e506ae4a9f9f7d1b765febfa84e10d48'
          'be55eabc102f2c60b38ed35c203686d6'
          '8d1dd54ae4a1b550c097e056892ce953'
-         'c8ac993bc9c0fe288c177a20630ccc46')
+         'f29e2d541f651dbdf4992b42e6cf0d6e'
+         'e0133ad89ab3014210d4599f396a556e')
+
 validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33')  #Paul Hardy
 
 _pkgver() {
@@ -101,7 +104,7 @@ prepare() {
 	cd "${srcdir}/grub-${_pkgver}/"
 	
 	msg "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig"
-	patch -Np1 -i "${srcdir}/grub-10_linux-detect-parabola-initramfs.patch"
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
 	echo
 	
 	msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig"
@@ -112,10 +115,14 @@ prepare() {
 	msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme"
 	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac"
 	
-        msg "Rebranding for some free distros"
-        patch -Np1 -i "${srcdir}/grub-10_linux-rebrand-free-distros.patch"
-        echo
-
+	msg "Patch to detect devicetree files (dtb)"
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch"
+	echo
+	
+	msg "Rebranding for some free distros"
+	patch -Np1 -i "${srcdir}/grub-10_linux-20_linux_xen-rebrand-free-distros.patch"
+	echo
+	
 	msg "Fix mkinitcpio 'rw' FS#36275"
 	sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
 	
-- 
cgit v1.2.3