summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--abs/core-testing/LinHES-config/PKGBUILD72
-rwxr-xr-xabs/core-testing/LinHES-config/mv_hostype.py2
-rwxr-xr-xabs/core-testing/LinHES-config/mv_ir.py15
-rw-r--r--abs/core-testing/mythinstall/PKGBUILD2
-rw-r--r--abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD4
-rw-r--r--abs/core-testing/mythtv/stable-0.22/mythsmolt/smolt_init_login.sh47
6 files changed, 118 insertions, 24 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD
index ce6d7d8..37d5f0a 100644
--- a/abs/core-testing/LinHES-config/PKGBUILD
+++ b/abs/core-testing/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.1
-pkgrel=32
+pkgrel=34
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'
@@ -136,3 +136,73 @@ md5sums=('297441b8d85820698c19e7c0ad5a3dfe'
'cf35353141b70145f3ee8b0bd852c9f1'
'cf60e7ba4cf3467bb5539d5c51da61b6'
'a63ff9ef5250965aeabc74bfa8e43981')
+md5sums=('297441b8d85820698c19e7c0ad5a3dfe'
+ '1a4694fcd694b362c339bda781ed0f3e'
+ 'e36da536dd651ef182e7642337889e77'
+ '3baa23764e1b6bcb2d66d7d859096940'
+ 'd7a8cd4a0060399ae22e69f74e04eb07'
+ '7a45287a07145fde5aa664583d4f6fba'
+ 'f88d2fb88339a4bf8ec9217a3fbcdef7'
+ '8ac1cfd2eca0f641737da0d0aca416a7'
+ 'd8a4a1699e04eed9ee69d58616069f33'
+ '4620f6f498ef4523398635cb0bd59425'
+ '06188493e5ed79cb501d3c5694dee8ca'
+ 'e459ed069317bccb20351f037a9df3d2'
+ '26ee0932243b79484b37eb8f6cf04cd4'
+ '6aff504ed5e860adc1b7317cd0780900'
+ '55fccb1da0417a896b724f7cfc32dd5a'
+ 'ab2aa42c2947148c2b1cac0ade6d1d55'
+ 'd429b59d3cfb37b0624c6a4a71a7c2c0'
+ 'a225143e3df6f56d451c2875e54ddbae'
+ '687555968d4ca688d8f95c8f13e1d8d4'
+ '3d1e4a119f38cff0498bf8a67e94e4b3'
+ '37401edf67296d3a4467ad178958d177'
+ 'ee7c8e1f025ce1527ecfffabafb26806'
+ '41b03fb1e0a9d9ae7588e3b813212772'
+ 'a9ffe72c3ede99d505fdc97572a7c256'
+ 'df43bce1712320508d4eef8449c5d223'
+ '65d93f15ac85adf8299552581789a731'
+ '4badc3c664c55f87396a473e6c14d4bc'
+ 'e2aa772fe0bf366e26eaaf663f9257bd'
+ 'fe5e31b833cc6707209e9d656b6eb53c'
+ 'd328d63eaa4252f3d4888476c79bbff6'
+ '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
+ '88059ef8c4a2926bb6fde14d810e1336'
+ 'cf35353141b70145f3ee8b0bd852c9f1'
+ 'cf60e7ba4cf3467bb5539d5c51da61b6'
+ 'a63ff9ef5250965aeabc74bfa8e43981')
+md5sums=('297441b8d85820698c19e7c0ad5a3dfe'
+ '1a4694fcd694b362c339bda781ed0f3e'
+ 'e36da536dd651ef182e7642337889e77'
+ '3baa23764e1b6bcb2d66d7d859096940'
+ 'd7a8cd4a0060399ae22e69f74e04eb07'
+ '7a45287a07145fde5aa664583d4f6fba'
+ 'f88d2fb88339a4bf8ec9217a3fbcdef7'
+ '8ac1cfd2eca0f641737da0d0aca416a7'
+ 'd8a4a1699e04eed9ee69d58616069f33'
+ '4620f6f498ef4523398635cb0bd59425'
+ '06188493e5ed79cb501d3c5694dee8ca'
+ 'e459ed069317bccb20351f037a9df3d2'
+ '26ee0932243b79484b37eb8f6cf04cd4'
+ '6aff504ed5e860adc1b7317cd0780900'
+ '55fccb1da0417a896b724f7cfc32dd5a'
+ 'ab2aa42c2947148c2b1cac0ade6d1d55'
+ 'd429b59d3cfb37b0624c6a4a71a7c2c0'
+ 'a225143e3df6f56d451c2875e54ddbae'
+ '687555968d4ca688d8f95c8f13e1d8d4'
+ '3d1e4a119f38cff0498bf8a67e94e4b3'
+ '37401edf67296d3a4467ad178958d177'
+ 'ee7c8e1f025ce1527ecfffabafb26806'
+ '41b03fb1e0a9d9ae7588e3b813212772'
+ 'a9ffe72c3ede99d505fdc97572a7c256'
+ 'df43bce1712320508d4eef8449c5d223'
+ '65d93f15ac85adf8299552581789a731'
+ '4badc3c664c55f87396a473e6c14d4bc'
+ 'e2aa772fe0bf366e26eaaf663f9257bd'
+ 'fe5e31b833cc6707209e9d656b6eb53c'
+ 'd328d63eaa4252f3d4888476c79bbff6'
+ '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
+ '857a831e8627727306208f0e776b1b98'
+ 'cf35353141b70145f3ee8b0bd852c9f1'
+ 'cf60e7ba4cf3467bb5539d5c51da61b6'
+ 'a63ff9ef5250965aeabc74bfa8e43981')
diff --git a/abs/core-testing/LinHES-config/mv_hostype.py b/abs/core-testing/LinHES-config/mv_hostype.py
index c6f4a36..4eade73 100755
--- a/abs/core-testing/LinHES-config/mv_hostype.py
+++ b/abs/core-testing/LinHES-config/mv_hostype.py
@@ -215,7 +215,7 @@ def hostypeprint(systemconfig):
else:
logging.debug(" Will NOT run the frontend")
mv_common.remove_service("frontend")
- mv_common.remove_service("hal")
+ mv_common.add_service("hal")
if data_config.SYSTEMTYPE == "MythVantage":
mv_common.remove_service("ghosd")
diff --git a/abs/core-testing/LinHES-config/mv_ir.py b/abs/core-testing/LinHES-config/mv_ir.py
index 3573ee3..a5e3f3b 100755
--- a/abs/core-testing/LinHES-config/mv_ir.py
+++ b/abs/core-testing/LinHES-config/mv_ir.py
@@ -113,7 +113,7 @@ def setup_ir_remote(Remotetype,templates):
mv_common.add_service("lircd")
-def setup_ir_receiver(ReceiverType,TEMPLATES):
+def setup_ir_receiver(ReceiverType,TEMPLATES,HDHRlirc_device,myip):
logging.info(" Configuring receiver %s", ReceiverType)
if ReceiverType == "Serial":
scrub_modules("/etc/modules.mythvantage","lirc")
@@ -153,6 +153,7 @@ def setup_ir_receiver(ReceiverType,TEMPLATES):
mv_common.runcmd(cmd)
mv_common.remove_service("igdaemon")
mv_common.remove_service("tatir")
+
elif ReceiverType == "iguanaIR-usb":
scrub_modules("/etc/modules.mythvantage","lirc")
mv_common.add_service("igdaemon")
@@ -162,6 +163,12 @@ def setup_ir_receiver(ReceiverType,TEMPLATES):
scrub_modules("/etc/modules.mythvantage","lirc")
mv_common.add_service("tatir")
mv_common.remove_service("igdaemon")
+ elif ReceiverType == "SiliconDust_HDHR":
+ mv_common.remove_service("igdaemon")
+ mv_common.remove_service("tatir")
+ cmd = '''hdhomerun_config %s set /ir/target %s:5000 store''' %(HDHRlirc_device,myip)
+ print cmd
+ mv_common.runcmd(cmd)
else:
logging.debug(" didn't match receiver, using genric case")
@@ -308,9 +315,11 @@ def setup_ir(systemconfig, data_config):
if systemconfig["ReceiverType"]:
setup_ir_receiver(systemconfig["ReceiverType"],
- systemconfig["TEMPLATES"])
+ systemconfig["TEMPLATES"],
+ systemconfig["HDHRlirc_device"],
+ systemconfig["mythip"])
else:
- setup_ir_receiver("unknown", systemconfig["TEMPLATES"])
+ setup_ir_receiver("unknown", systemconfig["TEMPLATES"],'','127.0.0.1')
unload_all_lirc()
setup_blaster_proto(HostBlasterType,
Hostnumblaster,
diff --git a/abs/core-testing/mythinstall/PKGBUILD b/abs/core-testing/mythinstall/PKGBUILD
index 6cc39a9..51950a0 100644
--- a/abs/core-testing/mythinstall/PKGBUILD
+++ b/abs/core-testing/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=2
-pkgrel=33
+pkgrel=37
pkgdesc="LinHES installer/systemconfig GUI."
arch=i686
depends=()
diff --git a/abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD
index 42674dd..d970cd9 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythsmolt
pkgver=0.22
-pkgrel=17
+pkgrel=26
pkgdesc="mythsmolt, a hardware profileing tool"
arch=('i686' 'x86_64')
url="http://www.mythvantage.com"
@@ -18,4 +18,4 @@ build() {
install -D -m 755 $srcdir/smolt_init_login.sh $pkgdir/etc/profile.d/smolt_init_login.sh
}
md5sums=('fdf68ec5c78827aefca6f09ad82296a4'
- 'c6789befd70278a453dc6be73ed240e7')
+ '57a3416d90e59abbd5062436583c17e1')
diff --git a/abs/core-testing/mythtv/stable-0.22/mythsmolt/smolt_init_login.sh b/abs/core-testing/mythtv/stable-0.22/mythsmolt/smolt_init_login.sh
index f22a09e..0b76305 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythsmolt/smolt_init_login.sh
+++ b/abs/core-testing/mythtv/stable-0.22/mythsmolt/smolt_init_login.sh
@@ -1,24 +1,39 @@
if [ $UID = 0 -o $UID = 1000 ]
then
- if [ ! -e /home/mythtv/.mythtv/MythSmolt/hw-uuid ]
+ INIT=`ps -p 1 -o comm=`
+ if [ x$INIT = xrunit ]
then
- echo ""
- echo "####################################################"
- echo "It appears you have not yet run smolt"
- echo "Please take the time to submit your hardware profile"
- echo ""
- echo "press any key to continue:"
- echo "####################################################"
- read a
- if [ $UID = 0 ]
+ if [[ -f /home/mythtv/.configure && $- = *i* ]]
then
- su mythtv -c "/usr/share/mythtv/mythsmolt/scripts/sendProfile.py"
- su mythtv -c "touch /home/mythtv/.mythtv/MythSmolt/hw-uuid"
- else
- /usr/share/mythtv/mythsmolt/scripts/sendProfile.py
- touch /home/mythtv/.mythtv/MythSmolt/hw-uuid
+ if [ ! -z "$PS1" ]
+ then
+ if [ $0 = "-bash" ]
+ then
+ if [ ! -e /home/mythtv/.mythtv/MythSmolt/hw-uuid ]
+ then
+ echo ""
+ echo "####################################################"
+ echo "It appears you have not yet run smolt"
+ echo "Please take the time to submit your hardware profile"
+ echo ""
+ echo "press any key to continue:"
+ echo "####################################################"
+ read a
+ mkdir -p /home/mythtv/.mythtv/MythSmolt
+ chown -R mythtv:users /home/mythtv/.mythtv/MythSmolt
+
+ if [ $UID = 0 ]
+ then
+ su mythtv -c "/usr/share/mythtv/mythsmolt/scripts/sendProfile.py" && su mythtv -c "touch /home/mythtv/.mythtv/MythSmolt/hw-uuid"
+ else
+ /usr/share/mythtv/mythsmolt/scripts/sendProfile.py && touch /home/mythtv/.mythtv/MythSmolt/hw-uuid
+ fi
+ fi
+ fi
+ fi
fi
-
fi
fi
+
+
generated by cgit v0.12 at 2024-09-12 02:18:36 (GMT)