summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2014-02-16 23:45:35 (GMT)
committerJames Meyer <james.meyer@operamail.com>2014-02-19 19:03:03 (GMT)
commit3a08e3dda29ad3aa8f2a4e82312dac3161e7bf6c (patch)
treef06b8318c1a8ec594899e2d89f4c7b0ad5ee5e6f
parentc4243584e2cc38bca40a9a209bd4582ebdb843f1 (diff)
downloadlinhes_pkgbuild-3a08e3dda29ad3aa8f2a4e82312dac3161e7bf6c.zip
linhes_pkgbuild-3a08e3dda29ad3aa8f2a4e82312dac3161e7bf6c.tar.gz
linhes_pkgbuild-3a08e3dda29ad3aa8f2a4e82312dac3161e7bf6c.tar.bz2
dmraid: update binary path to /usr/bin
refs #961
-rw-r--r--abs/core/dmraid/PKGBUILD16
-rw-r--r--abs/core/dmraid/dmraid.service3
-rw-r--r--abs/core/dmraid/dmraid_install2
3 files changed, 11 insertions, 10 deletions
diff --git a/abs/core/dmraid/PKGBUILD b/abs/core/dmraid/PKGBUILD
index 39f3672..c5bc12d 100644
--- a/abs/core/dmraid/PKGBUILD
+++ b/abs/core/dmraid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162150 2012-06-22 12:53:50Z dreisner $
+# $Id: PKGBUILD 197790 2013-10-30 08:14:33Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
pkgname=dmraid
pkgver=1.0.0.rc16.3
-pkgrel=7
+pkgrel=12
pkgdesc="Device mapper RAID interface"
url="http://people.redhat.com/~heinzm/sw/dmraid/"
conflicts=('mkinitcpio<0.7')
@@ -18,11 +18,6 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
dmraid_tmpfiles
dmraid.service)
install=dmraid.install
-md5sums=('819338fcef98e8e25819f0516722beeb'
- '2297d23cee1aef23ec6ad8d6d1870356'
- 'faec669dc85f87187b45b5d3968efe2c'
- '56a8bb0ece8d206cd8efb504ee072ddd'
- 'de0af1fdb9ed4c109b8119160167d2e9')
build() {
cd "$pkgname/1.0.0.rc16-3/$pkgname"
@@ -32,7 +27,7 @@ build() {
package() {
cd "$pkgname/1.0.0.rc16-3/$pkgname"
- make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
+ make DESTDIR="$pkgdir" sbindir=/usr/bin prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid
install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid
install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf
@@ -42,3 +37,8 @@ package() {
install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service"
}
+md5sums=('819338fcef98e8e25819f0516722beeb'
+ '7a040ebcba305aba1e47dfe6ca8323b5'
+ 'faec669dc85f87187b45b5d3968efe2c'
+ '56a8bb0ece8d206cd8efb504ee072ddd'
+ 'ea6d280fc6f63fb799abcd882bca53c8')
diff --git a/abs/core/dmraid/dmraid.service b/abs/core/dmraid/dmraid.service
index 1fd142f..c5d3d53 100644
--- a/abs/core/dmraid/dmraid.service
+++ b/abs/core/dmraid/dmraid.service
@@ -7,9 +7,8 @@ Before=basic.target shutdown.target
Conflicts=shutdown.target
[Service]
-ExecStart=/sbin/dmraid --ignorelocking --activate y -Z
Type=oneshot
-TimeoutSec=0
+ExecStart=/usr/bin/dmraid --ignorelocking --activate y -Z
RemainAfterExit=true
[Install]
diff --git a/abs/core/dmraid/dmraid_install b/abs/core/dmraid/dmraid_install
index d3238c1..acbc43d 100644
--- a/abs/core/dmraid/dmraid_install
+++ b/abs/core/dmraid/dmraid_install
@@ -6,9 +6,11 @@ build() {
add_binary 'dmraid'
add_binary 'dmsetup'
+ add_file "/usr/lib/device-mapper/libdmraid-events-isw.so"
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"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
add_runscript
}