Date: Saturday, February 6, 2010 @ 15:09:50 Author: tpowa Revision: 67410
fixes for new mkinitcpio Modified: dmraid/trunk/PKGBUILD dmraid/trunk/dmraid_hook dmraid/trunk/dmraid_install ----------------+ PKGBUILD | 21 ++++++--------------- dmraid_hook | 13 +++++-------- dmraid_install | 7 ++++--- 3 files changed, 15 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-02-06 19:20:52 UTC (rev 67409) +++ PKGBUILD 2010-02-06 20:09:50 UTC (rev 67410) @@ -4,7 +4,7 @@ pkgname=dmraid pkgver=1.0.0.rc16 -pkgrel=1 +pkgrel=2 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/"; depends=('device-mapper>=2.0.54') @@ -15,27 +15,18 @@ dmraid_hook) install=dmraid.install md5sums=('32832c1dfd7e72cd4355490322fca68a' - 'db9a72cbf07560059d407c874f646240' - 'afdb3cd655ea0145410e2aae247c7bcf') + 'b86ad3587cadd711b356d6ab49bdaf8d' + '2b1cb61f9cd8958363f260a5856acdd6') build() { cd $srcdir/$pkgname/$pkgver - - # create static bin - ./configure --enable-static_link --prefix=/usr + ./configure make || return 1 - make DESTDIR=$pkgdir exec_prefix=$pkgdir/usr install - mv $pkgdir/usr/sbin/dmraid $pkgdir/usr/sbin/dmraid.static - - # create dynamic linked bin - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir exec_prefix=$pkgdir/usr install + 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/usr/lib/libdmraid.a + chmod 644 $pkgdir/lib/libdmraid.a } - Modified: dmraid_hook =================================================================== --- dmraid_hook 2010-02-06 19:20:52 UTC (rev 67409) +++ dmraid_hook 2010-02-06 20:09:50 UTC (rev 67410) @@ -4,14 +4,11 @@ /sbin/modprobe -q dm-mod >/dev/null 2>&1 /sbin/modprobe -q dm-mirror >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then - read dev_t < /sys/class/misc/device-mapper/dev - /bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':') - - msg ":: Activating dmraid arrays..." - if [ "${quiet}" = "y" ]; then - /sbin/dmraid -ay -Z >/dev/null - else - /sbin/dmraid -ay -Z + if [ ! -e "/dev/mapper/control" ]; then + /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi + [ "${quiet}" = "y" ] && DMRAIDQUIET=">/dev/null" + msg ":: Activating dmraid arrays..." + /sbin/dmraid -ay -Z $DMRAIDQUIET fi } Modified: dmraid_install =================================================================== --- dmraid_install 2010-02-06 19:20:52 UTC (rev 67409) +++ dmraid_install 2010-02-06 20:09:50 UTC (rev 67410) @@ -3,12 +3,13 @@ install () { MODULES=" dm-mod dm-mirror " - BINARIES="" + BINARIES="dmraid dmsetup" FILES="" SCRIPT="dmraid" - add_dir "/dev/mapper" - add_file "/usr/sbin/dmraid.static" "/sbin/dmraid" + 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" } help ()
