[arch-commits] Commit in grub/trunk (PKGBUILD grub.install)

Ronald van Haren ronald at archlinux.org
Wed Nov 12 10:39:19 UTC 2008


    Date: Wednesday, November 12, 2008 @ 05:39:19
  Author: ronald
Revision: 18955

upgpkg: grub 0.97-14

Added:
  grub/trunk/grub.install
Modified:
  grub/trunk/PKGBUILD

--------------+
 PKGBUILD     |   25 +++++++++++--------------
 grub.install |   22 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-11-12 09:15:26 UTC (rev 18954)
+++ PKGBUILD	2008-11-12 10:39:19 UTC (rev 18955)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer: judd <jvinet at zeroflux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=grub
 pkgver=0.97
-pkgrel=13
+pkgrel=14
 pkgdesc="A GNU multiboot boot loader"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,11 +19,11 @@
         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'
@@ -31,11 +31,10 @@
          '49f6d4bcced0bc8bbcff273f3254bbfa'
          'f41f702014a064918d7afc6fc23baa6e'
          '175dc6b9f4ab94e8056c3afb3e34460a'
-         'ada26cbc681907823cc4ff2a55b97866'
-         '52cd09a6966f12961d11f7b3b7e76bd2')
+         'ada26cbc681907823cc4ff2a55b97866')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   #set destination architecture here
   DESTARCH="i686"
@@ -49,9 +48,6 @@
   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
@@ -72,12 +68,13 @@
   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 || return 1
+  gzip /$pkgdir/usr/share/info/*
 
-  rm -f ${pkgdir}/usr/share/info/dir
-
   if [ "$DESTARCH" = "x86_64" ]; then
     # fool makepkg into building a x86_64 package
     export CARCH="x86_64"

Added: grub.install
===================================================================
--- grub.install	                        (rev 0)
+++ grub.install	2008-11-12 10:39:19 UTC (rev 18955)
@@ -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
+}
+
+
+
+




More information about the arch-commits mailing list