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

[Dave Reisner]

    Date: Sunday, April 29, 2012 @ 01:29:29
  Author: dreisner
Revision: 157737

upgpkg: dmraid 1.0.0.rc16.3-4

- rebuild for /lib -> /usr/lib move
- strip absolute paths from binaries in initcpio hooks

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

----------------+
 PKGBUILD       |   14 +++++++-------
 dmraid_hook    |    6 +++---
 dmraid_install |   18 +++++++++---------
 3 files changed, 19 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-29 05:13:38 UTC (rev 157736)
+++ PKGBUILD	2012-04-29 05:29:29 UTC (rev 157737)
@@ -4,7 +4,7 @@
 
 pkgname=dmraid
 pkgver=1.0.0.rc16.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 conflicts=('mkinitcpio<0.7')
@@ -17,23 +17,23 @@
         dmraid_hook)
 install=dmraid.install
 md5sums=('819338fcef98e8e25819f0516722beeb'
-         '94dede91754b00783f1cd5244f6647bc'
-         '2a1ef82fb32f065ee560dceef736475e')
+         '832ed57a0f7ca6ba72adebcba2b17f87'
+         'faec669dc85f87187b45b5d3968efe2c')
 
 build() {
-  cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
+  cd "$pkgname/1.0.0.rc16-3/$pkgname"
   ./configure --enable-led --enable-intel_led
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
-  make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install
+  cd "$pkgname/1.0.0.rc16-3/$pkgname"
+  make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
   mkdir -p "$pkgdir"/var/lock/dmraid
   chmod 1777 "$pkgdir"/var/lock/
   install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid
   install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid
   # fix permissions
-  chmod 644 "$pkgdir"/lib/libdmraid.a
+  chmod 644 "$pkgdir"/usr/lib/libdmraid.a
   chmod 644 "$pkgdir"/usr/include/dmraid/*
 }

Modified: dmraid_hook
===================================================================
--- dmraid_hook	2012-04-29 05:13:38 UTC (rev 157736)
+++ dmraid_hook	2012-04-29 05:29:29 UTC (rev 157737)
@@ -1,13 +1,13 @@
 #!/usr/bin/ash
 
 run_hook() {
-    /sbin/modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1
+    modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1
     msg ":: Activating dmraid arrays..."
     # prevent any event monitoring calls with -I
     if [ "$quiet" = "y" ]; then
-        /sbin/dmraid -ay -I -Z >/dev/null
+        dmraid -ay -I -Z >/dev/null
     else
-        /sbin/dmraid -ay -I -Z
+        dmraid -ay -I -Z
     fi
 }
 

Modified: dmraid_install
===================================================================
--- dmraid_install	2012-04-29 05:13:38 UTC (rev 157736)
+++ dmraid_install	2012-04-29 05:29:29 UTC (rev 157737)
@@ -1,19 +1,19 @@
-# vim: set ft=sh:
+#!/bin/bash
 
-build()
-{
+build() {
     MODULES=" dm-mod dm-mirror "
-    BINARIES="/sbin/dmraid /sbin/dmsetup"
-    FILES=""
+    BINARIES="dmraid dmsetup"
     SCRIPT="dmraid"
+
     add_file "/usr/lib/udev/rules.d/10-dm.rules"
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
 }
 
-help ()
-{
-cat<<HELPEOF
-  This hook loads the necessary modules for a dmraid root device.
+help() {
+  cat <<HELPEOF
+This hook loads the necessary modules for a dmraid root device.
 HELPEOF
 }
+
+# vim: set ft=sh ts=4 sw=4 et: