[arch-commits] CVS update of core/base/grub (PKGBUILD)

[Thomas Baechler]

    Date: Sunday, February 10, 2008 @ 12:04:12
  Author: thomas
    Path: /home/cvs-core/core/base/grub

Modified: PKGBUILD (1.35 -> 1.36)

upgpkg: grub 0.97-10


----------+
 PKGBUILD |   34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)


Index: core/base/grub/PKGBUILD
diff -u core/base/grub/PKGBUILD:1.35 core/base/grub/PKGBUILD:1.36
--- core/base/grub/PKGBUILD:1.35	Fri Nov 16 01:11:53 2007
+++ core/base/grub/PKGBUILD	Sun Feb 10 12:04:11 2008
@@ -1,20 +1,25 @@
-# $Id: PKGBUILD,v 1.35 2007/11/16 00:11:53 daniel Exp $
+# $Id: PKGBUILD,v 1.36 2008/02/10 11:04:11 thomas Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 
 pkgname=grub
 pkgver=0.97
-pkgrel=9
+pkgrel=10
 pkgdesc="A GNU multiboot boot loader"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnu.org/software/grub/"
 groups=('base')
 depends=('ncurses')
-source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz \
-        menu.lst install-grub \
-        040_all_grub-0.96-nxstack.patch \
-        05-grub-0.97-initrdaddr.diff \
-        i2o.patch special-devices.patch more-raid.patch intelmac.patch)
+source=(ftp://alpha.gnu.org/gnu/grub/grub-$pkgver.tar.gz
+        menu.lst
+        install-grub
+        040_all_grub-0.96-nxstack.patch
+        05-grub-0.97-initrdaddr.diff
+        i2o.patch
+        special-devices.patch
+        more-raid.patch
+        intelmac.patch
+        grub-inode-size.patch)
 backup=('boot/grub/menu.lst')
 md5sums=('cd3f3eb54446be6003156158d51f4884'
          'cce52ae9ee1f8686cd700b3c967e78f9'
@@ -24,14 +29,15 @@
          '826fdbf446067f9861baf9f6a69a4583'
          '49f6d4bcced0bc8bbcff273f3254bbfa'
          'f41f702014a064918d7afc6fc23baa6e'
-         '175dc6b9f4ab94e8056c3afb3e34460a')
+         '175dc6b9f4ab94e8056c3afb3e34460a'
+         'ada26cbc681907823cc4ff2a55b97866')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
 
   #set destination architecture here
-  DESTARCH="i686"
-  #DESTARCH="x86_64"
+  #DESTARCH="i686"
+  DESTARCH="x86_64"
 
   # optimizations break the build -- disable them
   # adding special devices to grub, patches are from fedora
@@ -39,10 +45,12 @@
   patch -Np1 -i ../i2o.patch || return 1
   patch -Np1 -i ../more-raid.patch || return 1
   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
 
   #arch64 fixes for static build
   if [ "$CARCH" = "x86_64" ]; then
-    echo "this package has to be build on i686, won't compile on x86_64"
+    echo "this package has to be built on i686, won't compile on x86_64"
     sleep 5
   else
     if [ "$DESTARCH" = "x86_64" ]; then
@@ -61,10 +69,6 @@
   install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst
   install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub
 
-  # symlink for compatibility with the <=0.7 installer
-  mkdir -p $startdir/pkg/usr/share
-  ln -s ../lib/grub $startdir/pkg/usr/share/grub
-
   if [ "$DESTARCH" = "x86_64" ]; then
     # fool makepkg into building a x86_64 package
     export CARCH="x86_64"