summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--abs/core-testing/LinHES-system/PKGBUILD2
-rwxr-xr-xabs/core-testing/LinHES-system/firstboot.sh33
-rwxr-xr-xabs/core-testing/mythdb-initial/PKGBUILD5
-rw-r--r--abs/core-testing/mythdb-initial/custom.sql3
-rwxr-xr-xabs/core-testing/mythdb-initial/mythdb.install4
-rw-r--r--abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD4
-rw-r--r--abs/core-testing/python-simplejson/PKGBUILD24
-rwxr-xr-xabs/core-testing/runit-scripts/PKGBUILD2
-rwxr-xr-xabs/core-testing/runit-scripts/runitscripts/services/frontend/finish37
-rw-r--r--abs/core-testing/xdotool/PKGBUILD13
10 files changed, 94 insertions, 33 deletions
diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD
index 156d027..f4718bb 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=70
+pkgrel=71
arch=('i686')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
diff --git a/abs/core-testing/LinHES-system/firstboot.sh b/abs/core-testing/LinHES-system/firstboot.sh
index 47aa0f9..7e2f603 100755
--- a/abs/core-testing/LinHES-system/firstboot.sh
+++ b/abs/core-testing/LinHES-system/firstboot.sh
@@ -1,22 +1,29 @@
#!/bin/bash
. ~/.configured
ATTEMPT=0
+
function try_smolt {
- ((ATTEMPT=ATTEMPT+1))
- status=$(echo "jump mythsmolt" | telnet localhost 6546 2>&1)
- echo $status|grep -q refused
- status=$?
- if [ $status != 0 ]
- then
- fb_status=0
- echo "FB=NO" > ~/.configured
- fi
- if [ $ATTEMPT = 200 ]
- then
- fb_status=0
- fi
+ ((ATTEMPT=ATTEMPT+1))
+ WID=`xdotool search "mythfrontend" | head -1`
+ xdotool windowfocus $WID
+ status=$?
+ if [ $status = 0 ]
+ then
+ sleep 2
+ xdotool key "ctrl+alt+p"
+ xdotool key "ctrl+alt+p"
+ fb_status=0
+ echo "FB=NO" > ~/.configured
+ fi
+
+ if [ $ATTEMPT = 200 ]
+ then
+ fb_status=0
+ fi
+
}
+
if [ ! -e /tmp/debug ]
then
if [ ! -e /tmp/nomfe ]
diff --git a/abs/core-testing/mythdb-initial/PKGBUILD b/abs/core-testing/mythdb-initial/PKGBUILD
index a7c7ffa..d683ce1 100755
--- a/abs/core-testing/mythdb-initial/PKGBUILD
+++ b/abs/core-testing/mythdb-initial/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythdb-initial
pkgver=1
-pkgrel=43
+pkgrel=48
pkgdesc="setup the initial mythtv database for linhes"
url=""
license=""
@@ -10,7 +10,7 @@ conflicts=()
replaces=()
backup=()
install=mythdb.install
-source=(mc.sql permissions.sql)
+source=(mc.sql permissions.sql custom.sql)
md5sums=()
arch=('i686')
build() {
@@ -18,4 +18,5 @@ build() {
mkdir -p $startdir/pkg/data/database
cp mc.sql $startdir/pkg/data/database/mc.sql.initial
cp permissions.sql $startdir/pkg/data/database/permissions.sql
+ cp custom.sql $startdir/pkg/data/database/custom.sql
}
diff --git a/abs/core-testing/mythdb-initial/custom.sql b/abs/core-testing/mythdb-initial/custom.sql
new file mode 100644
index 0000000..1033a9e
--- /dev/null
+++ b/abs/core-testing/mythdb-initial/custom.sql
@@ -0,0 +1,3 @@
+INSERT INTO `jumppoints` (`destination`, `description`,`keylist`,`hostname`) VALUES
+('MythSmolt','Hardware profiler','Ctrl+Alt+p','larch5')
+
diff --git a/abs/core-testing/mythdb-initial/mythdb.install b/abs/core-testing/mythdb-initial/mythdb.install
index 4834c69..a4dcb84 100755
--- a/abs/core-testing/mythdb-initial/mythdb.install
+++ b/abs/core-testing/mythdb-initial/mythdb.install
@@ -11,16 +11,20 @@ post_install() {
then
cp /data/database/mc.sql.initial /data/database/mc.sql.fixed
cp /data/database/permissions.sql /data/database/permissions.sql.fixed
+ cp /data/database/custom.sql /data/database/custom.sql.fixed
else
sed -e "s/larch5/$HOST/g" /data/database/mc.sql.initial > /data/database/mc.sql.fixed
sed -e "s/larch5/$HOST/g" /data/database/permissions.sql > /data/database/permissions.sql.fixed
+ sed -e "s/larch5/$HOST/g" /data/database/custom.sql > /data/database/custom.sql.fixed
fi
mysql mythconverg < /data/database/mc.sql.fixed 2>/dev/null
mysql < /data/database/permissions.sql.fixed 2>/dev/null
+ mysql mythconverg < /data/database/custom.sql.fixed 2>/dev/null
rm /data/database/mc.sql.initial
+ rm /data/database/custom.sql.fixed
}
post_upgrade() {
echo "nothing to do"
diff --git a/abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD b/abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD
index aaec92e..8f0bd9e 100644
--- a/abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD
+++ b/abs/core-testing/mythtv/stable-0.22/mythsmolt/PKGBUILD
@@ -1,11 +1,11 @@
pkgname=mythsmolt
pkgver=0.22
-pkgrel=8
+pkgrel=11
pkgdesc="mythsmolt, a hardware profileing tool"
arch=('i686' 'x86_64')
url="http://www.mythvantage.com"
license=('GPL')
-depends=("mythtv>=${pkgver}" urlgrabber)
+depends=("mythtv>=${pkgver}" urlgrabber python-simplejson)
source=("http://www.mythvantage.com/request.php?4")
groups=('mythtv-extras')
diff --git a/abs/core-testing/python-simplejson/PKGBUILD b/abs/core-testing/python-simplejson/PKGBUILD
new file mode 100644
index 0000000..d1c7437
--- /dev/null
+++ b/abs/core-testing/python-simplejson/PKGBUILD
@@ -0,0 +1,24 @@
+# $ Id: $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: David Moore <davidm@sjsoft.com>
+
+pkgname=python-simplejson
+pkgver=2.0.9
+pkgrel=1
+pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
+license=('MIT')
+arch=('i686' 'x86_64')
+url="http://undefined.org/python/#simplejson"
+depends=('python')
+makedepends=('setuptools')
+source=("http://pypi.python.org/packages/source/s/simplejson/simplejson-${pkgver}.tar.gz")
+md5sums=('af5e67a39ca3408563411d357e6d5e47')
+
+build() {
+ cd ${srcdir}/simplejson-${pkgver}
+ python setup.py install --root=${pkgdir}
+
+ # License
+ install -Dm644 ${srcdir}/simplejson-${pkgver}/LICENSE.txt \
+ ${pkgdir}/usr/share/licenses/python-simplejson/license
+}
diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD
index 60d78b5..80f8054 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=101
+pkgrel=104
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish b/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish
index 5b0bd5b..417488d 100755
--- a/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish
+++ b/abs/core-testing/runit-scripts/runitscripts/services/frontend/finish
@@ -1,28 +1,45 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
+#!/bin/bash
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+function cleanup(){
+ rm -f /etc/sv/frontend/.runtime/*
+ printhl " Cleaning up /etc/sv/frontend/.runtime/"
+}
grep -q nox /proc/cmdline
STATUS=$?
if [ $STATUS = 0 ]
then
+ printhl " status = 0"
chvt 2
else
+ pkill -f "X :0"
+ printhl " status = 1"
if [ ! -d /etc/sv/frontend/.runtime ]
then
- mkdir -p /etc/sv/frontend/.runtime
+ mkdir -p /etc/sv/frontend/.runtime
fi
touch /etc/sv/frontend/.runtime/`date +%s`
sleep 0.2
ps -U mythtv -ef |grep "/bin/sh /usr/bin/startx"|grep -v grep|awk ' { print $2 } '|xargs kill -9 2> /dev/null
cdate=`date`
- numfiles=`/usr/bin/file_time_offset.py -s10 -d/etc/sv/frontend/.runtime`
- if [ $numfiles -gt 2 ]
+ numfilestotal=`/usr/bin/file_time_offset.py -s0 -d/etc/sv/frontend/.runtime`
+ numfilesover10secondsold=`/usr/bin/file_time_offset.py -s10 -d/etc/sv/frontend/.runtime`
+ numfileslessthan10secondsold=$(($numfilestotal-$numfilesover10secondsold))
+ if [ $numfileslessthan10secondsold -gt 2 ]
then
sv stop frontend
- rm -f /etc/sv/frontend/.runtime/*
- printhl " Frontend is not able to start, disabling it."
+ printhl " Frontend disabled, due to many restarts."
+ printhl " Run \"sv start frontend\" to try again"
+ cleanup
+ else
+ if [ $numfilestotal -gt 10 ]
+ then
+ cleanup
+ fi
fi
fi
+
diff --git a/abs/core-testing/xdotool/PKGBUILD b/abs/core-testing/xdotool/PKGBUILD
index 0fd5db1..bec09f9 100644
--- a/abs/core-testing/xdotool/PKGBUILD
+++ b/abs/core-testing/xdotool/PKGBUILD
@@ -1,5 +1,9 @@
+# $Id: PKGBUILD 7103 2010-01-01 04:09:10Z foutrelis $
+# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
+# Contributor: Rttommy <rttommy@gmail.com>
+
pkgname=xdotool
-pkgver=20090126
+pkgver=20091231.03
pkgrel=1
pkgdesc="Command-line X11 automation tool"
arch=('i686' 'x86_64')
@@ -7,14 +11,15 @@ url="http://www.semicomplete.com/projects/xdotool/"
license=('BSD')
depends=('libxtst')
source=(http://semicomplete.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('a520d6a3175c3b55582998cbeef81688')
+md5sums=('6228520608c831f64d13f4129cb4f381')
build() {
cd "$srcdir/$pkgname-$pkgver"
make || return 1
- install -dm755 "$pkgdir"/usr/{bin,share/man}
- make PREFIX="$pkgdir/usr" INSTALLMAN="$pkgdir/usr/share/man" install
+ install -d "$pkgdir"/usr/{bin,lib,include,share/man}
+ make PREFIX="$pkgdir/usr" INSTALLMAN="$pkgdir/usr/share/man" \
+ install || return 1
# License
install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/xdotool/COPYRIGHT"
generated by cgit v0.12 at 2024-11-10 19:29:40 (GMT)