diff options
Diffstat (limited to 'openembedded/packages')
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 de47b871a..26d8551b1 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 e8159dd98..b1f06fe3b 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 633f54611..4b224c22e 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 dcafb9e98..b2c4cf155 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 ;; *) |