summaryrefslogtreecommitdiff
path: root/libre/grub-legacy/PKGBUILD
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-07-12 22:53:11 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-07-12 22:53:11 -0300
commite14736ca7ac051726b587d8fdb8368be502a9109 (patch)
tree6a40b3b2de9bf45e8f31ba5fd45ee8f2615bd4ae /libre/grub-legacy/PKGBUILD
parente6e169990bdfc35fb6151f148510bf3f0da1dc1e (diff)
parent360a407f262ac47087ff29718465fbfc7765cb73 (diff)
downloadabslibre-e14736ca7ac051726b587d8fdb8368be502a9109.tar.gz
abslibre-e14736ca7ac051726b587d8fdb8368be502a9109.tar.bz2
abslibre-e14736ca7ac051726b587d8fdb8368be502a9109.zip
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/grub-legacy/PKGBUILD')
-rw-r--r--libre/grub-legacy/PKGBUILD14
1 files changed, 6 insertions, 8 deletions
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index 6c2afd3a8..036540e79 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -2,20 +2,18 @@
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
+# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
pkgname=grub-legacy
_srcname=grub
pkgver=0.97
-pkgrel=24
+pkgrel=25.1
pkgdesc="A GNU multiboot boot loader (Parabola rebranded)"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.gnu.org/software/grub/"
depends=('ncurses' 'diffutils' 'sed')
-conflicts=('grub' 'grub-common' 'grub-bios' 'grub-efi-i386' 'grub-efi-x86_64')
-replaces=('grub')
-provides=("grub=${pkgver}")
+conflicts=('grub')
[ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib')
optdepends=('xfsprogs: freezing of xfs /boot in install-grub script')
source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz
@@ -80,10 +78,10 @@ build() {
patch -Np1 -i ../040_all_grub-0.96-nxstack.patch
# patch from frugalware to make it boot when more than 2GB ram installed
patch -Np1 -i ../05-grub-0.97-initrdaddr.diff
- CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+ CFLAGS="-static -fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \
--mandir=/usr/share/man --infodir=/usr/share/info
else
- CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/bin --sbindir=/sbin \
+ CFLAGS="-fno-strict-aliasing" ./configure --prefix=/usr --bindir=/usr/bin --sbindir=/usr/bin \
--mandir=/usr/share/man --infodir=/usr/share/info
fi
}
@@ -94,6 +92,6 @@ package() {
CFLAGS= make
make DESTDIR=${pkgdir} install
install -D -m644 ../menu.lst ${pkgdir}/boot/grub/menu.lst
- install -D -m755 ../install-grub ${pkgdir}/sbin/install-grub
+ install -D -m755 ../install-grub ${pkgdir}/usr/bin/install-grub
}