[arch-commits] Commit in dmraid/trunk (PKGBUILD dmraid_hook dmraid_install)

[Thomas Bächler]

    Date: Monday, April 12, 2010 @ 13:35:37
  Author: thomas
Revision: 77403

Update dmraid to CVS snapshot, this should fix the monitoring and maybe other initramfs-related problems

Modified:
  dmraid/trunk/PKGBUILD
  dmraid/trunk/dmraid_hook
  dmraid/trunk/dmraid_install

----------------+
 PKGBUILD       |   37 ++++++++++++++++---------------------
 dmraid_hook    |    3 ++-
 dmraid_install |    4 +---
 3 files changed, 19 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-12 16:04:16 UTC (rev 77402)
+++ PKGBUILD	2010-04-12 17:35:37 UTC (rev 77403)
@@ -3,38 +3,33 @@
 #Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=dmraid
-pkgver=1.0.0.rc16
-pkgrel=3
+pkgver=1.0.0.rc16+CVS
+pkgrel=1
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 depends=('device-mapper>=2.0.54')
 arch=('i686' 'x86_64')
 license=('GPL')
-source=(http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-$pkgver.tar.bz2
+source=(http://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
+        #http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-$pkgver.tar.bz2
         dmraid_install
         dmraid_hook)
 install=dmraid.install
-md5sums=('32832c1dfd7e72cd4355490322fca68a'
-         '72b9ea8cf90fb8b6a3f3147fb7777fb4'
-         'b1fcca57a711be68b57c5ec8614d87cb')
+md5sums=('c0de87073de96b311d26ab0170b2a753'
+         'd01908b414e1686c0f3233ff37de78a5'
+         '2ffbadecbb742dbee16da2ff02794984')
 
 build() {
-  cd $srcdir/$pkgname/$pkgver
+  cd "$srcdir"/$pkgname/$pkgver
 
-  # create static bin
-  ./configure --enable-static_link --prefix=/usr --enable-led --enable-intel_led
-  make || return 1
-  make DESTDIR=$pkgdir exec_prefix=$pkgdir/usr install
-  mv $pkgdir/usr/sbin/dmraid $pkgdir/usr/sbin/dmraid.static
-
-  make clean
   ./configure --enable-led --enable-intel_led
   make || return 1
-  make DESTDIR=$pkgdir exec_prefix=$pkgdir/ mandir=$pkgdir/usr/share/man includedir=$pkgdir/usr/include install || return 1
-  mkdir -p $pkgdir/var/lock/dmraid
-  chmod 1777 $pkgdir/var/lock/
-  install -D -m644 $srcdir/dmraid_install $pkgdir/lib/initcpio/install/dmraid
-  install -D -m644 $srcdir/dmraid_hook $pkgdir/lib/initcpio/hooks/dmraid
-  # fix .a file
-  chmod 644 $pkgdir/lib/libdmraid.a
+  make DESTDIR="$pkgdir" mandir=/usr/share/man includedir=/usr/include install || return 1
+  mkdir -p "$pkgdir"/var/lock/dmraid
+  chmod 1777 "$pkgdir"/var/lock/
+  install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/lib/initcpio/install/dmraid
+  install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/lib/initcpio/hooks/dmraid
+  # fix permissions
+  chmod 644 "$pkgdir"/lib/libdmraid.a
+  chmod 644 "$pkgdir"/usr/include/dmraid/*
 }

Modified: dmraid_hook
===================================================================
--- dmraid_hook	2010-04-12 16:04:16 UTC (rev 77402)
+++ dmraid_hook	2010-04-12 17:35:37 UTC (rev 77403)
@@ -11,6 +11,7 @@
         fi
         [ "${quiet}" = "y" ] && DMRAIDQUIET=">/dev/null"
         msg ":: Activating dmraid arrays..."
-        /sbin/dmraid -ay -Z $DMRAIDQUIET
+	# prevent any event monitoring calls with -I
+        /sbin/dmraid -ay -I -Z $DMRAIDQUIET
     fi
 }

Modified: dmraid_install
===================================================================
--- dmraid_install	2010-04-12 16:04:16 UTC (rev 77402)
+++ dmraid_install	2010-04-12 17:35:37 UTC (rev 77403)
@@ -3,12 +3,10 @@
 install ()
 {
     MODULES=" dm-mod dm-mirror "
-    BINARIES="dmsetup"
+    BINARIES="/sbin/dmraid /sbin/dmsetup"
     FILES=""
     SCRIPT="dmraid"
-    add_file "/usr/sbin/dmraid.static" "/sbin/dmraid"
     add_dir "/dev/mapper"
-    add_binary "/lib/libdmraid-events-isw.so"
     add_file "/lib/udev/rules.d/10-dm.rules"
     add_file "/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/lib/udev/rules.d/95-dm-notify.rules"