diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-07 23:19:36 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-07 23:19:36 -0300 |
commit | a73dd5c830228a85fc975c4c4434b796e9e7858b (patch) | |
tree | a4b5b938456b2a4cc3045a8b8d4fd3117b9277db /libre/grub2/PKGBUILD | |
parent | 3b4c5929151db9bc1ea2e2e4f4ad22fed88a1a34 (diff) | |
parent | 37e364f033ed6db243d6db524075d8c5394c90f9 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnustep-make/PKGBUILD
extra/foomatic/PKGBUILD
extra/gnutls/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'libre/grub2/PKGBUILD')
-rw-r--r-- | libre/grub2/PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index b753d40a0..a33c57e42 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -14,7 +14,7 @@ pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') [ "$CARCH" = "mips64el" ] && pkgname=('grub2-common' 'grub2-loongson') pkgbase=grub2 pkgver=2.00beta3 -pkgrel=1 +pkgrel=1.1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -28,7 +28,7 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".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" - 'archlinux_grub_mkconfig_fixes.patch' + 'parabola_grub_mkconfig_fixes.patch' 'grub.default' 'grub.cfg' '20_memtest86+') @@ -43,7 +43,7 @@ sha1sums=('96bfdf4d53767faaf2c744ee82d4d703e4b672a2' 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' - 'cdace8067562fab04aaacac8d99a4ea612fa0c5b' + 'bf8e692c3920f0cf125ee77f14b8432133cae84d' '348b148d5183825f31a3d24a7ebf2d6a709f4e6a' '6f0870673b9f994163326a416432aee7eacdbfc5' 'ce35d7ae75cd1b5b677e894e528f96add40e77b9') @@ -54,8 +54,8 @@ _build_grub2-common_and_bios() { cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub_bios-${_pkgver}" cd "${srcdir}/grub_bios-${_pkgver}" - ## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch kernels and initramfs - patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch" + ## Apply Parabola specific fixes to enable grub-mkconfig detect Libre kernels and initramfs + patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo ## add the grub-extra sources |