diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-06-11 07:37:03 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-06-11 07:37:03 +0000 |
| commit | d5747c5ea115aeddf8f9d989e763c13016904571 (patch) | |
| tree | 7ed4bf15ffe358b87b576c018ee044e2b5d479bb | |
| parent | 750675a8caf36cfda7d6f3230615ee8b534e3f87 (diff) | |
| download | openembedded-core-d5747c5ea115aeddf8f9d989e763c13016904571.tar.gz openembedded-core-d5747c5ea115aeddf8f9d989e763c13016904571.tar.bz2 openembedded-core-d5747c5ea115aeddf8f9d989e763c13016904571.zip | |
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
| -rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate | 12 | ||||
| -rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 4 |
2 files changed, 10 insertions, 6 deletions
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 8e6a8b22cb..ee55784548 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 dff4b509a4..dcbea4a2ee 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 +} |