[arch-commits] Commit in grub2/repos (3 files)

[Ronald van Haren]

    Date: Monday, December 29, 2008 @ 05:40:02
  Author: ronald
Revision: 22860

Merged revisions 20457,22857,22859 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/grub2/trunk

........
  r20457 | ronald | 2008-12-04 15:53:57 +0100 (Thu, 04 Dec 2008) | 1 line
  
  upgpkg: grub2 1.96-2
........
  r22857 | ronald | 2008-12-29 11:34:41 +0100 (Mon, 29 Dec 2008) | 1 line
  
  upgpkg: grub2 1.96_20081229-1
........
  r22859 | ronald | 2008-12-29 11:39:12 +0100 (Mon, 29 Dec 2008) | 1 line
  
  upgpkg: grub2 1.96_20081229-1
........

Modified:
  grub2/repos/extra-i686/	(properties)
  grub2/repos/extra-i686/PKGBUILD
  grub2/repos/extra-i686/grub-1.96-chainloader.patch

-----------------------------+
 PKGBUILD                    |   23 ++++++++++++-----------
 grub-1.96-chainloader.patch |    2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)


Property changes on: grub2/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /grub2/trunk:1-20455
   + /grub2/trunk:1-22859

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-29 10:39:12 UTC (rev 22859)
+++ extra-i686/PKGBUILD	2008-12-29 10:40:02 UTC (rev 22860)
@@ -3,34 +3,35 @@
 # Contributor: dongiovanni <dongiovanni.archlinux.de>
 
 pkgname=grub2
-pkgver=1.96
-pkgrel=2
+pkgver=1.96_20081229
+pkgrel=1
 pkgdesc="The GNU GRand Unified Bootloader"
 url="http://www.gnu.org/software/grub/"
 arch=('i686' 'x86_64')
 license=('GPL3')
+
 depends=('bash' 'lzo2')
 conflicts=('grub')
 provides=('grub')
 backup=('boot/grub/grub.cfg')
 install=${pkgname}.install
-source=(ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz 'grub.cfg' 'install-grub' 
-	'grub-1.96-chainloader.patch')
-md5sums=('0a40cd2326a4e84d1978060f2e02a956'
+
+source=(http://www.archlinux.org/~ronald/grub2-1.96_20081229.tar.bz2
+	# use our own svn checkout so disable snapshot
+	#ftp://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.gz  
+	'grub.cfg'  
+	'install-grub')  
+md5sums=('e677ad5d3048c48c614bf703a74e4599'
          '743215998a581a54ac77630f0db222ce'
-         '3182c4ae4963a16930bc772bba89dacf'
-         '83cc4ebc0d41caa67a9954bd2ae3af15')
+         '3182c4ae4963a16930bc772bba89dacf')
 
 build() {
   # Set destination architecture here
   DESTARCH="i686"
   #DESTARCH="x86_64"
 
-  cd $srcdir/grub-${pkgver}
+  cd $srcdir/${pkgname}-${pkgver}
 
-  # Fix chainloader issue
-  patch -Np1 -i $srcdir/grub-1.96-chainloader.patch || return 1  
-
   # Arch64 grub2 needs to be statically build on i686
   if [ "$CARCH" = "x86_64" ]; then
     echo "this package has to be built on i686, won't compile on x86_64"

Modified: extra-i686/grub-1.96-chainloader.patch
===================================================================
--- extra-i686/grub-1.96-chainloader.patch	2008-12-29 10:39:12 UTC (rev 22859)
+++ extra-i686/grub-1.96-chainloader.patch	2008-12-29 10:40:02 UTC (rev 22860)
@@ -1,6 +1,6 @@
 diff -Nru grub-1.96.orig/kern/i386/pc/startup.S grub-1.96/kern/i386/pc/startup.S
 --- grub-1.96.orig/kern/i386/pc/startup.S	2008-02-03 14:11:32.000000000 +0100
-+++ grub-1.96/kern/i386/pc/startup.S	2008-02-17 06:22:54.000000000 +0100
++++ grub-1.96_20081229/kern/i386/pc/startup.S	2008-02-17 06:22:54.000000000 +0100
 @@ -594,15 +594,15 @@
  
  	call	EXT_C(grub_dl_unload_all)