diff options
Diffstat (limited to 'community/multipath-tools')
| -rw-r--r-- | community/multipath-tools/PKGBUILD | 45 | ||||
| -rw-r--r-- | community/multipath-tools/multipath.conf | 2 | ||||
| -rw-r--r-- | community/multipath-tools/multipath.conf.annotated | 8 | ||||
| -rw-r--r-- | community/multipath-tools/multipathd.rc | 2 |
4 files changed, 27 insertions, 30 deletions
diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD index bf4c18da8..7d9c38e2d 100644 --- a/community/multipath-tools/PKGBUILD +++ b/community/multipath-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64893 2012-02-18 19:44:21Z bpiotrowski $ +# $Id: PKGBUILD 68933 2012-04-06 00:04:44Z dreisner $ # Maintainer: # Contributor: Thomas S Hatch <thatch45 ar gmail dot com> # Contributor: Michael P <ptchinster@archlinux.us> @@ -6,42 +6,39 @@ pkgname=multipath-tools pkgver=0.4.9 -pkgrel=5 +pkgrel=6 pkgdesc="Multipath Tools For Linux" arch=('i686' 'x86_64') url="http://christophe.varoqui.free.fr/" license=('GPL') depends=('libaio' 'device-mapper') -backup=('etc/multipath.conf' 'etc/multipath.conf.annotated' 'etc/rc.d/multipathd' ) +backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') install=multipath-tools.install +options=('!emptydirs') source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2" - "multipath.conf" - "multipath.conf.annotated" - "multipathd.rc" - 'fix-build.patch') + "multipath.conf" "multipath.conf.annotated" "multipathd.rc" 'fix-build.patch') md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' - 'd0fb11398cc628c7997111efdc5d52e5' - '5a93f993ec05fc99094d5139aabd3925' - '1c2dcf43a6b5ae84ec1fae0fee071336' + '9324ff0ba8330dcb21b2fcf64988026f' + 'be11462922eeeb9fcd2ba5f3f137b7d9' + '7c04ef96441363b0d43a2ebb13a87659' '2576fc535d7fa767837b1c7827013e52') build() { - #Needs to be fixed upstream. Refer to - # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 - cd "$srcdir" - - patch -p1 -i "${srcdir}"/fix-build.patch + patch -p1 -i fix-build.patch - env LDFLAGS=${LDFLAGS//-Wl,--as-needed}\ - make + sed -i 's|etc/udev|usr/lib/udev|g' multipath/Makefile kpartx/Makefile + sed -i 's|/sbin/|/usr/bin/|g' kpartx/kpartx.rules + + # Needs to be fixed upstream. Refer to + # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 + export LDFLAGS=${LDFLAGS/-Wl,--as-needed} + + make } package() { - cd "$srcdir" - - make LIB="lib" DESTDIR="$pkgdir" install - - install -D -m 644 "$srcdir"/multipath.conf "$pkgdir"/etc/multipath.conf - install -D -m 644 "$srcdir"/multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated - install -D -m 755 "$srcdir"/multipathd.rc "$pkgdir"/etc/rc.d/multipathd + make LIB="usr/lib" DESTDIR="$pkgdir" bindir="/usr/bin" libudevdir="/usr/lib/udev" install + install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf + install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated + install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd } diff --git a/community/multipath-tools/multipath.conf b/community/multipath-tools/multipath.conf index ba9f788ae..6dacf093d 100644 --- a/community/multipath-tools/multipath.conf +++ b/community/multipath-tools/multipath.conf @@ -3,6 +3,6 @@ # defaults { - getuid_callout"/lib/udev/scsi_id -g -u -d /dev/%n" + getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n" } diff --git a/community/multipath-tools/multipath.conf.annotated b/community/multipath-tools/multipath.conf.annotated index e6cfe9a1a..b79488413 100644 --- a/community/multipath-tools/multipath.conf.annotated +++ b/community/multipath-tools/multipath.conf.annotated @@ -47,9 +47,9 @@ # # scope : multipath # # desc : the default program and args to callout to obtain a unique # # path identifier. Absolute path required -# # default : /lib/udev/scsi_id -g -u -s +# # default : /usr/lib/udev/scsi_id -g -u -s # # -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" # # # # # name : prio_callout @@ -291,9 +291,9 @@ # # scope : multipath # # desc : the program and args to callout to obtain a unique # # path identifier. Absolute path required -# # default : /lib/udev/scsi_id -g -u -s +# # default : /usr/lib/udev/scsi_id -g -u -s # # -# getuid_callout "/lib/udev/scsi_id -g -u -s /block/%n" +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" # # # # # name : prio_callout diff --git a/community/multipath-tools/multipathd.rc b/community/multipath-tools/multipathd.rc index 21ffcaa5a..7f5ef5d6a 100644 --- a/community/multipath-tools/multipathd.rc +++ b/community/multipath-tools/multipathd.rc @@ -6,7 +6,7 @@ case "$1" in start) stat_busy "Starting multipathd" - /sbin/multipathd + /usr/bin/multipathd if [ $? -gt 0 ]; then stat_fail else |