From 20971c00ce9d6d814104b3a0d3b7bd1e5acf71cb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sun, 28 Jul 2013 10:13:13 -0300
Subject: grub-2.00.5043-3: fix 10_linux

---
 libre/grub/PKGBUILD                        | 22 +++++++++++++---------
 libre/grub/grub-2.00-mkinitcpio-0.15.patch | 11 +++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 libre/grub/grub-2.00-mkinitcpio-0.15.patch

(limited to 'libre/grub')

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 56d994beb..72517680b 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -13,7 +13,7 @@ _GRUB_BZR_REV="5043"
 pkgname=grub
 pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
 pkgver=2.00.${_GRUB_BZR_REV}
-pkgrel=2
+pkgrel=3
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
 license=('GPL3')
@@ -40,19 +40,20 @@ optdepends=('freetype2: For grub-mkfont usage'
 source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}"
         'parabola_grub_mkconfig_fixes.patch'
         '60_memtest86+'
-        'grub.default')
+        'grub.default'
+        'grub-2.00-mkinitcpio-0.15.patch')
+md5sums=('SKIP'
+         'b3068b52b6f1dcd2850b5c7585bb185f'
+         'be55eabc102f2c60b38ed35c203686d6'
+         '52d374e0194e3f2e39ff7c92ecd58a6c'
+         'd25d2dcf8ba708dcf768fcaea799f59c'
+         'SKIP'
+         'SKIP')
 
 for _DIR_ in 915resolution ntldr-img ; do
 	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
 done
 
-# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
-sha1sums=('SKIP'
-          '513172d91d1a2e2cda7c0a744c766d5868cb28bf'
-          '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
-          '06b926320cb2add6c157d59d46e553b89dd3aa03'
-          'SKIP'
-          'SKIP')
 
 _build_grub-common_and_bios() {
 	
@@ -169,6 +170,9 @@ prepare() {
 	fi
 	
 	cd "${srcdir}/grub-${pkgver}/"
+
+        ## fix 10_linux
+	patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
 	
 	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
 	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
diff --git a/libre/grub/grub-2.00-mkinitcpio-0.15.patch b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
new file mode 100644
index 000000000..1af848fa3
--- /dev/null
+++ b/libre/grub/grub-2.00-mkinitcpio-0.15.patch
@@ -0,0 +1,11 @@
+--- util/grub.d/10_linux.in.old	2013-07-28 08:55:47.825946239 +0200
++++ util/grub.d/10_linux.in	2013-07-28 08:56:14.082201512 +0200
+@@ -138,7 +138,7 @@
+   message="$(gettext_printf "Loading Linux %s ..." "${version}")"
+   sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$message" | grub_quote)'
+-	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args}
+ EOF
+   if test -n "${initrd}" ; then
+     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
-- 
cgit v1.2.3-54-g00ecf


From d18ef2452dff30319d4aa989f9deecb5966d8795 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sun, 28 Jul 2013 10:21:23 -0300
Subject: grub-2.00.5043-3: fix blank spaces on PKGBUILD

---
 libre/grub/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libre/grub')

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 72517680b..2221fb7fe 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -170,13 +170,13 @@ prepare() {
 	fi
 	
 	cd "${srcdir}/grub-${pkgver}/"
-
-        ## fix 10_linux
-	patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
 	
 	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
 	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
 	echo
+
+	## fix 10_linux
+	patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
 	
 	## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
 	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
-- 
cgit v1.2.3-54-g00ecf