From d5747c5ea115aeddf8f9d989e763c13016904571 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 11 Jun 2007 07:37:03 +0000 Subject: xserver-kdrive-common: run calibration only on machines with touchscreen git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1904 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate | 12 ++++++++---- .../xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'meta') diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate index 8e6a8b22c..ee5578454 100644 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate @@ -1,6 +1,10 @@ #!/bin/sh -while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] -do - /usr/bin/xtscal -done +. /etc/formfactor/config + +if [ "$HAVE_TOUCHSCREEN" = "1" ]; then + while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] + do + /usr/bin/xtscal + done +fi diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index dff4b509a..dcbea4a2e 100644 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/meta/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 xinit formfactor" -PR = "r17" +PR = "r18" SRC_URI = "file://etc" S = ${WORKDIR} @@ -15,4 +15,4 @@ do_install() { rm -fR ${D}/etc/*/.svn rm -fR ${D}/etc/*/*/.svn chmod -R 755 ${D}/etc -} \ No newline at end of file +} -- cgit v1.2.3