[arch-commits] CVS update of arch/build/system/kexec-tools (PKGBUILD kexec)

[Thomas Baechler]

    Date: Sunday, May 13, 2007 @ 07:56:44
  Author: thomas
    Path: /home/cvs-arch/arch/build/system/kexec-tools

Modified: PKGBUILD (1.5 -> 1.6) kexec (1.5 -> 1.6)

upgpkg: kexec-tools 1.101-7


----------+
 PKGBUILD |   11 +++++++----
 kexec    |    4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)


Index: arch/build/system/kexec-tools/PKGBUILD
diff -u arch/build/system/kexec-tools/PKGBUILD:1.5 arch/build/system/kexec-tools/PKGBUILD:1.6
--- arch/build/system/kexec-tools/PKGBUILD:1.5	Mon Feb 26 16:31:06 2007
+++ arch/build/system/kexec-tools/PKGBUILD	Sun May 13 07:56:43 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.5 2007/02/26 21:31:06 tpowa Exp $
+# $Id: PKGBUILD,v 1.6 2007/05/13 11:56:43 thomas Exp $
 # Contributor: Camille Moncelier <pix at devlife.org>, simo <simo at archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kexec-tools
 pkgver=1.101
-pkgrel=6
+pkgrel=7
 pkgdesc="Load another kernel from the currently executing Linux kernel"
 arch=(686 x86_64)
 url="http://www.xmission.com/~ebiederm/files/kexec/"
@@ -12,15 +12,18 @@
         kexec.conf.d kexec kexec-vesafb.diff)
 depends=('zlib' 'awk')
 backup=('etc/conf.d/kexec')
+arch=('i686')
 md5sums=('b4f7ffcc294d41a6a4c40d6e44b7734d' 'b9ddfb9fbcc7e4e7e7294fe94fa60aeb'\
-         'eb88931332961e65cd0dd9bcce98f06f' '3c61494a396110768a60ba341bab2058')
+         '15599234f174ddc4d2611f32effec6ab' '3c61494a396110768a60ba341bab2058')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   patch -Np1 -i ../kexec-vesafb.diff || return 1
   ./configure --prefix=/usr
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$startdir/pkg install || return 1
+  
+  mv $startdir/pkg/usr/sbin $startdir/pkg/sbin
 
   install -D -m644 kexec/kexec.8 $startdir/pkg/usr/man/man8/kexec.8
   install -D -m644 $startdir/src/kexec.conf.d $startdir/pkg/etc/conf.d/kexec
Index: arch/build/system/kexec-tools/kexec
diff -u arch/build/system/kexec-tools/kexec:1.5 arch/build/system/kexec-tools/kexec:1.6
--- arch/build/system/kexec-tools/kexec:1.5	Mon Feb 26 16:31:06 2007
+++ arch/build/system/kexec-tools/kexec	Sun May 13 07:56:43 2007
@@ -17,7 +17,7 @@
       stat_busy "Loading kernel for Kexec into running kernel"
       [ -f "$KPATH" ] || stat_fail
       [ -f "$INITRD" ] && _INITRD="--initrd=$INITRD"
-      /usr/sbin/kexec -l $KPATH --append="root=$ROOTPART $KPARAM" $_INITRD > /dev/null 2>&1
+      /sbin/kexec -l $KPATH --append="root=$ROOTPART $KPARAM" $_INITRD > /dev/null 2>&1
     else
       stat_busy "Skipping loading kernel for Kexec into running kernel"
     fi
@@ -31,7 +31,7 @@
 
   unload)
     stat_busy "Unloading Kexec kernel from running kernel"
-    /usr/sbin/kexec -u
+    /sbin/kexec -u
     if [ $? -eq 0 ] ; then
       stat_done
     else