diff --git a/PKGBUILD b/PKGBUILD index 7cd70d9..e6c9733 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: judd +# Maintainer: Ronald van Haren pkgname=grub pkgver=0.97 -pkgrel=13 +pkgrel=14 pkgdesc="A GNU multiboot boot loader" arch=('i686' 'x86_64') license=('GPL') @@ -18,11 +18,11 @@ source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz special-devices.patch more-raid.patch intelmac.patch - grub-inode-size.patch - grub-0.97-gpt.patch) + grub-inode-size.patch) backup=('boot/grub/menu.lst') +install=grub.install md5sums=('cd3f3eb54446be6003156158d51f4884' - 'cce52ae9ee1f8686cd700b3c967e78f9' + 'a2098dc41fc3cb13e53179de2979d088' '3182c4ae4963a16930bc772bba89dacf' 'eb9d69c46af3a0667c1f651817d7f075' 'ccd2d757e79e3a03dc19ede7391ed328' @@ -30,11 +30,10 @@ md5sums=('cd3f3eb54446be6003156158d51f4884' '49f6d4bcced0bc8bbcff273f3254bbfa' 'f41f702014a064918d7afc6fc23baa6e' '175dc6b9f4ab94e8056c3afb3e34460a' - 'ada26cbc681907823cc4ff2a55b97866' - '52cd09a6966f12961d11f7b3b7e76bd2') + 'ada26cbc681907823cc4ff2a55b97866') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver #set destination architecture here DESTARCH="i686" @@ -48,9 +47,6 @@ build() { patch -Np1 -i ../intelmac.patch || return 1 # Add support for bigger inode size to e2fs_stage1_5 patch -Np1 -i ../grub-inode-size.patch || return 1 - # Add gpt support - # http://bugs.archlinux.org/task/9864 - patch -Np1 -i ../grub-0.97-gpt.patch || return 1 #arch64 fixes for static build if [ "$CARCH" = "x86_64" ]; then @@ -71,11 +67,12 @@ build() { fi CFLAGS= make || return 1 - make DESTDIR=$startdir/pkg install + make DESTDIR=$pkgdir install || return 1 install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub - - rm -f ${pkgdir}/usr/share/info/dir + + rm -f $pkgdir/usr/share/info/dir || return 1 + gzip /$pkgdir/usr/share/info/* if [ "$DESTARCH" = "x86_64" ]; then # fool makepkg into building a x86_64 package diff --git a/grub.install b/grub.install new file mode 100644 index 0000000..bf52382 --- /dev/null +++ b/grub.install @@ -0,0 +1,22 @@ +info_dir=/usr/share/info +info_files=(grub.info multiboot.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + + + +