diff options
| -rw-r--r-- | libre/grub2/PKGBUILD | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index a5051900f..1ef7c3934 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _grub_bzr_rev="4232" -_pkgver="2.00~beta4" +_pkgver="2.00~beta6" _grub_lua_ver=24 _grub_gpxe_ver=12 @@ -12,7 +12,7 @@ _grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase=grub2 -pkgver=2.00beta4 +pkgver=2.00beta6 pkgrel=1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') @@ -30,15 +30,14 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz 'parabola_grub_mkconfig_fixes.patch' 'grub.default' 'grub.cfg' - '20_memtest86+' - 'grub-install.fix') + '20_memtest86+') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") -sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11' +sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb' '89290031b974780c6df76893836d2477d4add895' 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' @@ -46,8 +45,8 @@ sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11' '31aa740fc225b3f3ed4917843038f9e8658a71be' '348b148d5183825f31a3d24a7ebf2d6a709f4e6a' '9735043d518e16f147f64ef283eceb2549fed860' - 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' - '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7') + 'ce35d7ae75cd1b5b677e894e528f96add40e77b9') + _build_grub2-common_and_bios() { ## copy the source for building the common/bios package @@ -58,10 +57,6 @@ _build_grub2-common_and_bios() { patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo - ## upstream grub-install fix - ## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html - patch -Np0 -i "${srcdir}/grub-install.fix" - ## add the grub-extra sources export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/" install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras" @@ -204,7 +199,7 @@ package_grub2-common() { options=('strip' 'purge' 'docs' 'zipman' '!emptydirs') cd "${srcdir}/grub_bios-${_pkgver}" - make DESTDIR="${pkgdir}/" install + make bashcompletiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}/" install ## install extra /etc/grub.d/ files install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" |