diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-26 10:36:11 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-26 10:36:11 -0300 |
| commit | 33f415176525625b793cdfa66f3fc5828214a34e (patch) | |
| tree | 4f60a7d083ef4d8d0324f840d13267e58d790a17 /libre/grub2 | |
| parent | 14a4ed053872549facd5a1f4817bee71bb21c8f7 (diff) | |
| parent | 9a6b691757346035549dbd12d1323301d04a6675 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus-core/dbus
testing/dbus-core/dbus.install
testing/psmisc/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd-tools.install
testing/systemd/systemd.install
testing/sysvinit/PKGBUILD
Diffstat (limited to 'libre/grub2')
| -rw-r--r-- | libre/grub2/PKGBUILD | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index dd5dab575..0e03539ba 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -2,18 +2,16 @@ # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -_grub_bzr_rev="4232" -_pkgver="2.00~beta6" +_pkgver="2.00~rc1" _grub_lua_ver=24 -_grub_gpxe_ver=12 _grub_ntldr_ver=21 _grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') [ "$CARCH" = "mips64el" ] && pkgname=('grub2-common' 'grub2-loongson') pkgbase=grub2 -pkgver=2.00beta6 +pkgver=2.00rc1 pkgrel=1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +23,6 @@ makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo' # source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz" source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" 'parabola_grub_mkconfig_fixes.patch' @@ -34,13 +31,11 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz '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=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb' +sha1sums=('2f5ca951c3cb9ca364d38e4b4a2ca2a232fc4c13' '89290031b974780c6df76893836d2477d4add895' - 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' '31aa740fc225b3f3ed4917843038f9e8658a71be' @@ -65,9 +60,6 @@ _build_grub2-common_and_bios() { bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \ - -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \ -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" @@ -126,9 +118,6 @@ _build_grub2-efi-i386() { bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" - bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \ - -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" - ## Requires python2 # sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh" |