Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD

4 files changed, 17 insertions, 6 deletions

diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD
index d8cfe29..30c5052 100644
--- a/abs/core-testing/lirc/PKGBUILD
+++ b/abs/core-testing/lirc/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lirc
 pkgver=0.8.5CVS
-pkgrel=11
+pkgrel=12
 _kernver=2.6.28-LinHES
 pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
 arch=(i686 x86_64)
@@ -21,7 +21,8 @@ source=(http://www.blushingpenguin.com/mark/lmilk/lirc-0.8.5-CVS-pvr150.tar.bz2
 	http://superb-east.dl.sourceforge.net/sourceforge/mod-mce/lirc_mod_mce-0.1.5.tar.bz2
 	lirc_mod_mce.patch
 	hw_commandir.c
-	hw_commandir.h)
+	hw_commandir.h
+	dvicoIR.rules)
 
 build() {
 	# configure
@@ -65,6 +66,9 @@ build() {
 	rm $startdir/pkg/lib/modules/$_kernver/kernel/drivers/misc/lirc_cmdir.ko
 	rm $startdir/pkg/lib/modules/$_kernver/kernel/drivers/misc/commandir.ko
 
+	# Add a udev rule for the DVICO remote so that if there is more than 
+	# one hiddev device, the systm cant get confused.
+	install -D -m644 $srcdir/dvicoIR.rules $pkgdir/etc/udev/rules.d/dvicoIR.rules
 }
 md5sums=('b96dae91b566143b3af433fa2714ec9a'
          '1753acd774f50b638e6173d364de53fd'
@@ -73,4 +77,5 @@ md5sums=('b96dae91b566143b3af433fa2714ec9a'
          '21ce358809105f005e888e3b138c59e6'
          'd299b696b007fc9b663a73cc1758a1ef'
          'f059f4030afc682c9539a03bf837c1cf'
-         '4e698654cc44fc6c4163814acda5a7ee')
+         '4e698654cc44fc6c4163814acda5a7ee'
+         'd79400e2e3069b14039ca07d3317965c')
diff --git a/abs/core-testing/lirc/dvicoIR.rules b/abs/core-testing/lirc/dvicoIR.rules
new file mode 100644
index 0000000..5d6d066
--- /dev/null
+++ b/abs/core-testing/lirc/dvicoIR.rules
@@ -0,0 +1,5 @@
+# Added to get DVICO remote to be consistant device
+SUBSYSTEMS=="usb", KERNEL=="hiddev*", \
+    ATTRS{product}=="DVICO USB HID Remocon V1.00", \
+    SYMLINK+="usb/dvicoIR"
+
diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
index 6596371..0644c3b 100755
--- a/abs/core-testing/runit-scripts/PKGBUILD
+++ b/abs/core-testing/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=runit-scripts
 pkgver=1.8.0
-pkgrel=83
+pkgrel=84
 pkgdesc="collection of startup scripts for runit"
 url="http://smarden.org/runit/"
 license="BSD"
@@ -28,3 +28,4 @@ build() {
   install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
   rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
 }
+md5sums=('c6cbd6af3657783bd1ce8f75f574d72f')
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
index 59206ae..6d67537 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
+++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run
@@ -106,7 +106,7 @@ else
         if [ $RunDvico = "true" -a $num_lirc -lt 0 ]
         then
 	        #only run dvicio
-	        LCMD="/usr/sbin/lircd -n -d /dev/usb/hiddev0 --driver=dvico  --output /dev/lircd"
+	        LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico  --output /dev/lircd"
 	    #      echo $LCMD
 		printhl "	Device Dvicio"
 		
@@ -115,7 +115,7 @@ else
         then
             #chain them together
             i=$((i+1))
-            CMD="/usr/sbin/lircd -d /dev/usb/hiddev0 --driver=dvico  --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
+            CMD="/usr/sbin/lircd -d /dev/usb/dvicoIR --driver=dvico  --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
     #        echo $CMD
             $CMD >> $LOG
             LASTCMD="--connect=localhost:876$i   $LASTCMD    "