diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-05-22 22:14:32 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-05-22 22:14:32 +0000 |
| commit | ad4b746c07563a50fd35f6f68ebb82acdc0f194c (patch) | |
| tree | 3d230c7788d0a504d083ff24c7be5c77a0568c23 | |
| parent | a21cef816585683556abd873c83ed0fdb5938f32 (diff) | |
| download | openembedded-core-ad4b746c07563a50fd35f6f68ebb82acdc0f194c.tar.gz openembedded-core-ad4b746c07563a50fd35f6f68ebb82acdc0f194c.tar.bz2 openembedded-core-ad4b746c07563a50fd35f6f68ebb82acdc0f194c.zip | |
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
4 files changed, 8 insertions, 8 deletions
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 de47b871a2..26d8551b18 100644 --- 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 e8159dd98b..b1f06fe3b6 100644 --- 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 633f546117..4b224c22e5 100644 --- 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 dcafb9e98f..b2c4cf1558 100755 --- 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 ;; *) |