Don't run touchscreen calibration if a touchscreen isn't configured

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@405 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2006-05-22 22:14:32 +00:00
parent a21cef8165
commit ad4b746c07
4 changed files with 8 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
#!/bin/sh
if [ ! -f /etc/pointercal ]; then
if [ ! -f /etc/pointercal ] && [ ! -z "$TSLIB_TSDEVICE" ]; then
/usr/bin/xtscal
fi

View File

@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal"
PR = "r5"
PR = "r6"
SRC_URI = "file://etc"
S = ${WORKDIR}

View File

@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
LICENSE = "GPL"
SECTION = "x11"
PRIORITY = "optional"
PR = "r1"
PR = "r2"
SRC_URI = "file://xserver-nodm"
S = ${WORKDIR}

View File

@@ -14,7 +14,7 @@ case "$1" in
/etc/X11/Xserver &
export DISPLAY=:0
while [ ! -f /etc/pointercal ]
while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
do
/usr/bin/xtscal
done
@@ -24,10 +24,10 @@ case "$1" in
stop)
echo "Stopping XServer"
killproc /usr/bin/Xfbdev
killproc /usr/bin/Xomap
killproc /usr/bin/Xorg
killproc /usr/bin/Xepson
killproc Xfbdev
killproc Xomap
killproc Xorg
killproc Xepson
;;
*)