grub-1:2.02.beta2-3: remove 09_parabola config

1 files changed, 11 insertions, 9 deletions

diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index ecf9bade2..b7b7b80bd 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -15,7 +15,7 @@ _UNIFONT_VER="6.3.20131217"
 pkgname="grub"
 pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
 pkgver=2.02.beta2
-pkgrel=2.1
+pkgrel=3
 epoch="1"
 url="https://www.gnu.org/software/grub/"
 arch=('x86_64' 'i686')
@@ -43,22 +43,23 @@ 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-add-GRUB_COLOR_variables.patch'
-        '09_parabola'
         '60_memtest86+'
         'grub.default'
-        '10_linux.in.patch')
+        'grub-10_linux-rebrand-free-distros.patch')
+
 md5sums=('SKIP'
          'SKIP'
          '728b7439ac733a7c0d56049adec364c7'
          'SKIP'
+         '945527e0de8d384166a4cf23439ae9ee'
          'e506ae4a9f9f7d1b765febfa84e10d48'
-         '9f67330f2979a153acb32af706e0c094'
          'be55eabc102f2c60b38ed35c203686d6'
          '52d374e0194e3f2e39ff7c92ecd58a6c'
          'b23a144b7001c88734b79ed3bec491c4')
 
-pkgver() {
+_pkgver() {
 	cd "${srcdir}/grub-${_pkgver}/"
 	echo "$(git describe --tags)" | sed -e 's|grub.||g' -e 's|-|\.|g'
 }
@@ -67,6 +68,10 @@ 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"
+	echo
+	
 	msg "Patch to enable GRUB_COLOR_* variables in grub-mkconfig"
 	## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
 	patch -Np1 -i "${srcdir}/grub-add-GRUB_COLOR_variables.patch"
@@ -76,7 +81,7 @@ prepare() {
 	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}/10_linux.in.patch"
+        patch -Np1 -i "${srcdir}/grub-10_linux-rebrand-free-distros.patch"
         echo
 
 	msg "Fix mkinitcpio 'rw' FS#36275"
@@ -237,9 +242,6 @@ _package_grub-common_and_bios() {
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
 	
-	msg "Install 09_parabola helper script for grub-mkconfig"
-	install -D -m0755 "${srcdir}/09_parabola" "${pkgdir}/etc/grub.d/09_parabola"
-	
 	msg "Install extra /etc/grub.d/ files"
 	install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"