mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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:
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ ! -f /etc/pointercal ]; then
|
||||
if [ ! -f /etc/pointercal ] && [ ! -z "$TSLIB_TSDEVICE" ]; then
|
||||
/usr/bin/xtscal
|
||||
fi
|
||||
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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
|
||||
;;
|
||||
|
||||
*)
|
||||
|
||||
Reference in New Issue
Block a user