[arch-commits] Commit in dmraid/trunk (PKGBUILD dmraid_hook dmraid_install)
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 === --- PKGBUILD2012-04-29 05:13:38 UTC (rev 157736) +++ PKGBUILD2012-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=('mkinitcpio0.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 21 +modprobe -a -q dm-mod dm-mirror /dev/null 21 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 () -{ -catHELPEOF - 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:
[arch-commits] Commit in dmraid/trunk (PKGBUILD dmraid_hook dmraid_install)
Date: Thursday, June 30, 2011 @ 14:03:08 Author: thomas Revision: 129977 dmraid: Adjust mkinitcpio hook for mkinitcpio 0.7 Modified: dmraid/trunk/PKGBUILD dmraid/trunk/dmraid_hook dmraid/trunk/dmraid_install + PKGBUILD |7 --- dmraid_hook|3 ++- dmraid_install |3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-06-30 17:57:50 UTC (rev 129976) +++ PKGBUILD2011-06-30 18:03:08 UTC (rev 129977) @@ -4,9 +4,10 @@ pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=1 +pkgrel=2 pkgdesc=Device mapper RAID interface url=http://people.redhat.com/~heinzm/sw/dmraid/; +conflicts=('mkinitcpio0.7') depends=('device-mapper=2.0.54') arch=('i686' 'x86_64') license=('GPL') @@ -16,8 +17,8 @@ dmraid_hook) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - 'd01908b414e1686c0f3233ff37de78a5' - '0a748b6e78b156f2f9dda45fc629651f') + 'bf6c61a11dbbb40d5152835075c9f438' + '2a1ef82fb32f065ee560dceef736475e') build() { cd $srcdir/$pkgname/1.0.0.rc16-3/$pkgname Modified: dmraid_hook === --- dmraid_hook 2011-06-30 17:57:50 UTC (rev 129976) +++ dmraid_hook 2011-06-30 18:03:08 UTC (rev 129977) @@ -5,7 +5,8 @@ /sbin/modprobe -q dm-mirror /dev/null 21 if [ -e /sys/class/misc/device-mapper ]; then if [ ! -e /dev/mapper/control ]; then -/bin/mknod /dev/mapper/control c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') +mkdir /dev/mapper +mknod /dev/mapper/control c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi msg :: Activating dmraid arrays... # prevent any event monitoring calls with -I Modified: dmraid_install === --- dmraid_install 2011-06-30 17:57:50 UTC (rev 129976) +++ dmraid_install 2011-06-30 18:03:08 UTC (rev 129977) @@ -1,12 +1,11 @@ # vim: set ft=sh: -install () +build() { MODULES= dm-mod dm-mirror BINARIES=/sbin/dmraid /sbin/dmsetup FILES= SCRIPT=dmraid -add_dir /dev/mapper 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
[arch-commits] Commit in dmraid/trunk (PKGBUILD dmraid_hook dmraid_install)
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 === --- PKGBUILD2010-04-12 16:04:16 UTC (rev 77402) +++ PKGBUILD2010-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' - '72b9ea8cf90fb8b6a3f3147fbfb4' - '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
[arch-commits] Commit in dmraid/trunk (PKGBUILD dmraid_hook dmraid_install)
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 === --- PKGBUILD2010-02-06 19:20:52 UTC (rev 67409) +++ PKGBUILD2010-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 21 /sbin/modprobe -q dm-mirror /dev/null 21 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 ()