diff options
author | Sorin-Mihai Vârgolici <smv@yobicore.org> | 2011-08-08 23:33:22 +0300 |
---|---|---|
committer | Sorin-Mihai Vârgolici <smv@yobicore.org> | 2011-08-08 23:33:22 +0300 |
commit | a57480b7f6cfc785a17cf97ba79bb29ae59d4148 (patch) | |
tree | b6ed09c3b3c542995158c482a69496bc005c3fed /libre/grub2/PKGBUILD | |
parent | 6eacab5dc148ba36d27be900315cd1b8a2531f9a (diff) | |
parent | 162d18734029e6aa4bc29cc8dee9adfe000c36fd (diff) |
Merge branch 'master' of ssh://parabola-git/abslibre
Diffstat (limited to 'libre/grub2/PKGBUILD')
-rw-r--r-- | libre/grub2/PKGBUILD | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index 6d884dcea..7c1c0177a 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -11,11 +11,11 @@ _grub2_915_ver=6 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase="grub2" pkgver='1.99~rc1' -pkgrel=4 +pkgrel=4.1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') -makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper') +makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'flex') options=(strip purge docs zipman !emptydirs) source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz" @@ -27,7 +27,8 @@ source=("ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz" 'grub.default' 'grub.cfg' '20_memtest86+' - '05_archtheme') + '05_archtheme' + 'parabola-mkconfig.patch') noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" "grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz" @@ -55,6 +56,7 @@ build_grub2-common_and_bios() { ## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch kernels and initramfs cd ${srcdir}/grub2_bios-${pkgver} patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch + patch -Np1 -i ${srcdir}/parabola-mkconfig.patch # add the grub-extra sources export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/ @@ -88,7 +90,8 @@ build_grub2-common_and_bios() { --bindir=/bin --sbindir=/sbin \ --mandir=/usr/share/man --infodir=/usr/share/info \ --sysconfdir=/etc --enable-nls \ - --program-transform-name=s,grub,grub, + --program-transform-name=s,grub,grub, \ + --disable-werror CFLAGS="" make } @@ -118,7 +121,8 @@ build_grub2-efi() { --prefix=/usr --bindir=/bin \ --sbindir=/sbin --mandir=/usr/share/man \ --infodir=/usr/share/info --sysconfdir=/etc \ - --enable-nls --program-transform-name=s,grub,grub, + --enable-nls --program-transform-name=s,grub,grub, \ + --disable-werror CFLAGS="" make } @@ -201,4 +205,5 @@ md5sums=('fd602ffaada5ba7939d0ea47091841a5' '50123c37cf145a98aba4ffb0fc4efba1' '7cb90ebb04b856ded6ae171c3658fba2' '5a07e04c4ecb8ed145d54fec3043e0d5' - 'e143ae2e453b7c3ced309667df30da55') + 'e143ae2e453b7c3ced309667df30da55' + 'bc369fcd7576beba804cad91f2b79f8f') |