summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-06-11 07:37:03 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-06-11 07:37:03 +0000
commitd5747c5ea115aeddf8f9d989e763c13016904571 (patch)
tree7ed4bf15ffe358b87b576c018ee044e2b5d479bb /meta/packages
parent750675a8caf36cfda7d6f3230615ee8b534e3f87 (diff)
downloadpoky-d5747c5ea115aeddf8f9d989e763c13016904571.tar.gz
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
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate12
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb4
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 @@
1#!/bin/sh 1#!/bin/sh
2 2
3while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] 3. /etc/formfactor/config
4do 4
5 /usr/bin/xtscal 5if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
6done 6 while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
7 do
8 /usr/bin/xtscal
9 done
10fi
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"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor" 4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
5PR = "r17" 5PR = "r18"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${WORKDIR}
@@ -15,4 +15,4 @@ do_install() {
15 rm -fR ${D}/etc/*/.svn 15 rm -fR ${D}/etc/*/.svn
16 rm -fR ${D}/etc/*/*/.svn 16 rm -fR ${D}/etc/*/*/.svn
17 chmod -R 755 ${D}/etc 17 chmod -R 755 ${D}/etc
18} \ No newline at end of file 18}