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

diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
index de47b871a2234a94b463f3a76ae3d5a1ef49a8de..26d8551b18d3f1006802a8ce00ee70770f75efe5 100644 (file)
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ ! -f /etc/pointercal ]; then
+if [ ! -f /etc/pointercal ] && [ ! -z "$TSLIB_TSDEVICE" ]; then
     /usr/bin/xtscal
 fi
 

diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index e8159dd98bfef13667432de918db31d3e2dcabb1..b1f06fe3b6664ade950a7655ff7f85c12f93a7d7 100644 (file)
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -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}

diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
index 633f54611776d7472fe909de9728588c6f7d43de..4b224c22e59e9e88e0c5f07f4db43525b5cbca2c 100644 (file)
--- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
@@ -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}

diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index dcafb9e98f7a020f87c82ce695fcfeb5e583e19e..b2c4cf1558f2f82bf2e2bb026293f406b7a01c28 100755 (executable)
--- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -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
   ;;
 
   *)