From c178c09e525aa63e4e41337770c41ab67bbf800e Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Sun, 27 Sep 2015 18:52:40 -0300
Subject: grub: fix devicetree patch

---
 libre/grub/PKGBUILD                                |  2 +-
 ..._linux-20_linux_xen-detect-devicetree-dir.patch | 34 ++++++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

(limited to 'libre')

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 1c4625f9d..dd2a26c94 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -90,7 +90,7 @@ md5sums=('SKIP'
          'e506ae4a9f9f7d1b765febfa84e10d48'
          'be55eabc102f2c60b38ed35c203686d6'
          '8d1dd54ae4a1b550c097e056892ce953'
-         'f29e2d541f651dbdf4992b42e6cf0d6e'
+         '2687392cc5d709b4ef465b1efe91d053'
          'e0133ad89ab3014210d4599f396a556e')
 
 validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33')  #Paul Hardy
diff --git a/libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch b/libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch
index 002bc4c02..8c8e31788 100644
--- a/libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch
+++ b/libre/grub/grub-10_linux-20_linux_xen-detect-devicetree-dir.patch
@@ -1,21 +1,22 @@
 diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
 --- a/util/grub.d/10_linux.in	2015-09-27 14:14:45.544730230 -0300
-+++ b/util/grub.d/10_linux.in	2015-09-27 15:15:26.759140186 -0300
-@@ -138,6 +138,13 @@
- 	echo	'$(echo "$message" | grub_quote)'
++++ b/util/grub.d/10_linux.in	2015-09-27 18:43:26.911364096 -0300
+@@ -139,6 +139,14 @@
  	initrd	${rel_dirname}/${initrd}
  EOF
-+  if test -d "${dirname}/dtb/${version}" ; then
+   fi
++  if test -d "${rel_dirname}/dtb/${version}" ; then
 +  # TRANSLATORS: Device tree path isn't identifier. Should be translated.
 +  message="$(gettext_printf "Loading devices tree path ...")"
 +  sed "s/^/$submenu_indentation/" << EOF
-+	echo    '$(echo "$message" | grub_quote)'
-+	devicetree ${dirname}/dtb/${version}
++	echo	'$(echo "$message" | grub_quote)'
++	devicetree	${rel_dirname}/dtb/${version}
 +EOF
-   fi
++  fi
    sed "s/^/$submenu_indentation/" << EOF
  }
-@@ -222,6 +229,10 @@
+ EOF
+@@ -222,6 +230,10 @@
      linux_root_device_thisversion=${GRUB_DEVICE}
    fi
  
@@ -28,22 +29,23 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
 --- a/util/grub.d/20_linux_xen.in	2015-09-27 14:14:45.544730230 -0300
-+++ b/util/grub.d/20_linux_xen.in	2015-09-27 15:15:26.760140194 -0300
-@@ -131,6 +131,13 @@
- 	echo	'$(echo "$message" | grub_quote)'
++++ b/util/grub.d/20_linux_xen.in	2015-09-27 18:47:34.953427471 -0300
+@@ -132,6 +132,14 @@
  	module	--nounzip   ${rel_dirname}/${initrd}
  EOF
-+  if test -d "${dirname}/dtb/${version}" ; then
+   fi
++  if test -d "${rel_dirname}/dtb/${version}" ; then
 +  # TRANSLATORS: Device tree path isn't identifier. Should be translated.
 +  message="$(gettext_printf "Loading devices tree path ...")"
 +  sed "s/^/$submenu_indentation/" << EOF
-+	echo    '$(echo "$message" | grub_quote)'
-+	devicetree ${dirname}/dtb/${version}
++	echo	'$(echo "$message" | grub_quote)'
++	devicetree	${rel_dirname}/dtb/${version}
 +EOF
-   fi
++  fi
    sed "s/^/$submenu_indentation/" << EOF
  }
-@@ -235,6 +242,10 @@
+ EOF
+@@ -235,6 +243,10 @@
  	    linux_root_device_thisversion=${GRUB_DEVICE}
  	fi
  
-- 
cgit v1.2.3-54-g00ecf