From 73f7ddc1f26796682680a0a1cf62dd32240db0a0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 2 Apr 2009 14:12:12 -0500
Subject: LinHES-system: general cleanup of boot and of course Hauppauge!!

---
 abs/core-testing/LinHES-system/PKGBUILD            |  2 +-
 .../LinHES-system/load-modules-mythvantage.sh      | 26 +++++++++++++++++-----
 abs/core-testing/initscripts/PKGBUILD              |  4 ++--
 abs/core-testing/initscripts/rc.sysinit.patch      | 12 ++++++++--
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD
index 49f325f..f984a86 100644
--- a/abs/core-testing/LinHES-system/PKGBUILD
+++ b/abs/core-testing/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=1.0
-pkgrel=46
+pkgrel=48
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
diff --git a/abs/core-testing/LinHES-system/load-modules-mythvantage.sh b/abs/core-testing/LinHES-system/load-modules-mythvantage.sh
index 8382a29..142f7c2 100755
--- a/abs/core-testing/LinHES-system/load-modules-mythvantage.sh
+++ b/abs/core-testing/LinHES-system/load-modules-mythvantage.sh
@@ -16,17 +16,31 @@ UNLOAD|unload )
         #try to load the cx88 modules
         if [ ! x$SystemType = xFrontend_only ]
         then
-        	/sbin/modprobe cx88-dvb 2>/dev/null
+            /sbin/modprobe cx88-dvb 2>/dev/null
         fi
 
         if [ -f /etc/modules.mythvantage ]
         then
-	       while read line
-	       do
+           while read line
+           do
                 module=`echo $line |cut -d# -f1`
-	           /sbin/modprobe $module
-
-	       done < /etc/modules.mythvantage
+                #this doesn't do anything on boot cause ttySX does not yet exisit
+                if [ x$module = xlirc_serial ]
+                then
+                    if [ x$ReceiverType = xSerial ]
+                    then
+                        case $ReceiverSerialport in
+                            ttyS0) FLAGS="io=0x3f8  irq=4";;
+                            ttyS1) FLAGS="io=0x2f8  irq=3" ;;
+                            ttyS2) FLAGS="io=0x3e8  irq=4" ;;
+                            ttyS3) FLAGS="io=0x2f8  irq=3" ;;
+                        esac
+                        /usr/bin/setserial /dev/$ReceiverSerialport uart none 2>/dev/null
+                        /sbin/modprobe lirc_serial $FLAGS 2>/dev/null
+                    fi
+                fi
+                /sbin/modprobe $module 2> /dev/null
+           done < /etc/modules.mythvantage
         fi
 esac
 
diff --git a/abs/core-testing/initscripts/PKGBUILD b/abs/core-testing/initscripts/PKGBUILD
index 43e0ed9..c568c38 100644
--- a/abs/core-testing/initscripts/PKGBUILD
+++ b/abs/core-testing/initscripts/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=initscripts
 pkgver=2009.01
-pkgrel=6
+pkgrel=7
 pkgdesc="System initialization/bootup scripts"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org"
@@ -12,7 +12,7 @@ license=('GPL')
 groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
 depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=118' 'net-tools' 'ncurses' 'kbd' 'findutils')
-source=(ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.gz)
+source=(ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.gz rc.sysinit.patch rc.shutdown.patch)
 md5sums=('b947f3efd5d4681459fe8073d610f1b5')
 
 build() {
diff --git a/abs/core-testing/initscripts/rc.sysinit.patch b/abs/core-testing/initscripts/rc.sysinit.patch
index 3fc7162..6556069 100644
--- a/abs/core-testing/initscripts/rc.sysinit.patch
+++ b/abs/core-testing/initscripts/rc.sysinit.patch
@@ -1,5 +1,5 @@
---- rc.sysinit.orig	2009-02-12 22:43:03.000000000 +0000
-+++ rc.sysinit	2009-02-12 22:43:39.000000000 +0000
+--- /tmp/rc.sysinit.orig	2009-04-02 16:40:47.000000000 +0000
++++ rc.sysinit	2009-04-02 16:44:20.000000000 +0000
 @@ -7,10 +7,9 @@
  . /etc/rc.d/functions
  
@@ -14,3 +14,11 @@
  printhl "Distributed under the GNU General Public License (GPL)"
  printsep
  
+@@ -85,6 +84,7 @@
+ if ! [ "$load_modules" = "off" ]; then
+ 	if [ -f /proc/modules ]; then
+ 		stat_busy "Loading Modules"
++		/usr/LH/bin/load-modules-mythvantage.sh
+ 		for mod in "${MODULES[@]}"; do
+ 			if [ "$mod" = "${mod#!}" ]; then
+ 				/sbin/modprobe $mod
-- 
cgit v0.12