summaryrefslogtreecommitdiff
path: root/libre/grub2/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'libre/grub2/PKGBUILD')
-rw-r--r--libre/grub2/PKGBUILD27
1 files changed, 16 insertions, 11 deletions
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD
index df7449cba..cf1afc868 100644
--- a/libre/grub2/PKGBUILD
+++ b/libre/grub2/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
-_grub_bzr_rev="4169"
-_pkgver="2.00~beta3"
+_grub_bzr_rev="4232"
+_pkgver="2.00~beta4"
_grub_lua_ver=24
_grub_gpxe_ver=12
@@ -12,8 +12,8 @@ _grub_915_ver=9
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase=grub2
-pkgver=2.00beta3
-pkgrel=1.1
+pkgver=2.00beta4
+pkgrel=1
url="http://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
@@ -30,23 +30,24 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz
'parabola_grub_mkconfig_fixes.patch'
'grub.default'
'grub.cfg'
- '20_memtest86+')
+ '20_memtest86+'
+ 'grub-install.fix')
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=('96bfdf4d53767faaf2c744ee82d4d703e4b672a2'
+sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11'
'89290031b974780c6df76893836d2477d4add895'
'b04994c005910b4bf123f034b30109d5c8d6fd86'
'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a'
'd5ae2efec25616028a9d89e98b6e454f1c4c415f'
- 'bf8e692c3920f0cf125ee77f14b8432133cae84d'
+ '31aa740fc225b3f3ed4917843038f9e8658a71be'
'348b148d5183825f31a3d24a7ebf2d6a709f4e6a'
- '6f0870673b9f994163326a416432aee7eacdbfc5'
- 'ce35d7ae75cd1b5b677e894e528f96add40e77b9')
-
+ '22063a0c7a779997a7763123a3064f7c1586674b'
+ 'ce35d7ae75cd1b5b677e894e528f96add40e77b9'
+ '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7')
_build_grub2-common_and_bios() {
## copy the source for building the common/bios package
@@ -57,6 +58,10 @@ _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"
@@ -188,7 +193,7 @@ build() {
package_grub2-common() {
- pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms"
+ pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms (Parabola rebranded)"
depends=('xz' 'freetype2' 'gettext' 'device-mapper' 'fuse' 'sh')
conflicts=('grub')
backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')