diff options
author | James Meyer <james.meyer@operamail.com> | 2013-12-27 16:58:21 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2013-12-27 16:58:37 (GMT) |
commit | 912e7ca6626505c47c3c582efb74ff26bc418a37 (patch) | |
tree | a9b5d9779792c587c04019f1d959a57b31027189 | |
parent | 15d5058bbe99f3046f81206723b8a57a5e4305f9 (diff) | |
download | linhes_pkgbuild-912e7ca6626505c47c3c582efb74ff26bc418a37.zip linhes_pkgbuild-912e7ca6626505c47c3c582efb74ff26bc418a37.tar.gz linhes_pkgbuild-912e7ca6626505c47c3c582efb74ff26bc418a37.tar.bz2 |
runit-scrips , mv_ir: remove loading of lirc_serial by modules.mythvantage, the run script takes care of loading with the correct values.
Add more debugging to remotes log
refs #950
-rwxr-xr-x | abs/core/LinHES-config/PKGBUILD | 4 | ||||
-rwxr-xr-x | abs/core/LinHES-config/mv_ir.py | 5 | ||||
-rwxr-xr-x | abs/core/runit-scripts/PKGBUILD | 2 | ||||
-rwxr-xr-x | abs/core/runit-scripts/runitscripts/services/remotes/run | 25 |
4 files changed, 24 insertions, 12 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 75b93a2..5ca210b 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.1 -pkgrel=8 +pkgrel=9 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -159,7 +159,7 @@ md5sums=('8ee14247b04ab4152d4919d4d4b8d869' 'c0549457750c4f8e8038d904a0f3012a' '075fe16ef92621ce31f41df5c5577daf' 'b845de3e05c1734cce4b9ac5e8f1baaf' - '31ad5416bf2ab1909338a16035941127' + '6356c271bf6639002d4c59406250a1f6' '8b7dce4a3a0a281fa6656aa8781a648e' 'f7f2dc11d1ba454cd25eeaa133104b62' '824e49d9b01fed295c704ab68908b464' diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py index f481fa4..1eae985 100755 --- a/abs/core/LinHES-config/mv_ir.py +++ b/abs/core/LinHES-config/mv_ir.py @@ -202,7 +202,8 @@ def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip): logging.info(" Configuring receiver %s", ReceiverType) if ReceiverType == "serial": scrub_modules("/etc/modules.mythvantage","lirc") - add_module("/etc/modules.mythvantage","lirc_serial #lirc") + #loading takes place in remotes/run + #add_module("/etc/modules.mythvantage","lirc_serial #lirc") cmd = "load-modules-mythvantage.sh" mv_common.runcmd(cmd) mv_common.remove_service("igdaemon") @@ -301,7 +302,7 @@ def setup_blaster_transmiter(HostBlasterType): mv_common.add_service("igdaemon") elif HostBlasterType == "serial": scrub_modules("/etc/modules.mythvantage","blaster") - add_module("/etc/modules/.mythvantage","lirc_serial #blaster") + #add_module("/etc/modules/.mythvantage","lirc_serial #blaster") cmd = "load-modules-mythvantage.sh" mv_common.runcmd(cmd) elif HostBlasterType == "pvr150": diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 9857b4a..b1240ab 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.1 -pkgrel=5 +pkgrel=6 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/remotes/run b/abs/core/runit-scripts/runitscripts/services/remotes/run index 4040d7e..2363a3a 100755 --- a/abs/core/runit-scripts/runitscripts/services/remotes/run +++ b/abs/core/runit-scripts/runitscripts/services/remotes/run @@ -14,6 +14,10 @@ fi echo "`date` --- run started" >> $LOG +echo "====== lirc modules already loaded ==========" >> $LOG +lsmod |grep lirc >> $LOG +echo "====== lirc modules end =========" >> $LOG +echo >> $LOG #What is done in this file may not be enough to start your specific remote. #If that is true of your remote place your remote startup commands in: # /etc/runit/lirc.sh @@ -47,29 +51,36 @@ else if [ -n "$serial_port" ] then + echo "Serial device setup: $serial_port" >>$LOG #/dev/ttyS0 (COM1), port 0x3f8, irq 4 #/dev/ttyS1 (COM2), port 0x2f8, irq 3 #/dev/ttyS2 (COM3), port 0x3e8, irq 4 #/dev/ttyS3 (COM4), port 0x2e8, irq 3 - + printhl " Using serial device, loading module lirc_serial" case $serial_port in ttyS0) - FLAGS="io=0x3f8 irq=4" + FLAGS="io=0x3f8 irq=4 debug=1 " ;; ttyS1) - FLAGS="io=0x2f8 irq=3" + FLAGS="io=0x2f8 irq=3 debug=1" ;; ttyS2) - FLAGS="io=0x3e8 irq=4" + FLAGS="io=0x3e8 irq=4 debug=1" ;; ttyS3) - FLAGS="io=0x2e8 irq=3" + FLAGS="io=0x2e8 irq=3 debug=1" ;; esac - /usr/bin/setserial /dev/$serial_port uart none + + /usr/bin/setserial /dev/$serial_port uart none 2>&1 >> $LOG sleep 0.5 - /sbin/modprobe lirc_serial $FLAGS + echo "/sbin/modprobe lirc_serial $FLAGS" 2>&1 >> $LOG + /sbin/modprobe lirc_serial $FLAGS 2>&1 >> $LOG sleep 0.5 + echo "====== dmesg output ============" >>$LOG + dmesg | tail -10 >> $LOG + echo "======= dmesg end ===========" >>$LOG + fi if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ] |