summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-02-23 15:06:49 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-02-23 15:18:07 +0100
commit5c3846f9bbf1dbb4a9ee1d916107747c2f9dc909 (patch)
tree591b301955aa718b72cd6de487a004b3ffa19abe
parent9471f8941b763c03eabc3ef0d87110687e2f26db (diff)
xserver-kdrive-common: SHR - don't force user to calibrate his screen after first boot, but restore calibration if available.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate2
-rw-r--r--recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
2 files changed, 3 insertions, 1 deletions
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
index 0abe3b427d..a39ece5e57 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/shr/89xTs_Calibrate
@@ -28,6 +28,7 @@ if [ -d $SYSFS_CALIBRATION_DIR ]; then
fi
if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
+ if [ -e /etc/pointercal.xinput ] ; then
if [ -e /usr/bin/fsoraw ] ; then
# because ts tap to unblank will be used as first calibration click and then store invalid calibration
fsoraw -fr CPU,Display -- /usr/bin/xinput_calibrator_once.sh
@@ -35,4 +36,5 @@ if [ -e /usr/bin/xinput_calibrator_once.sh ] ; then
/usr/bin/xinput_calibrator_once.sh
fi
exit
+ fi
fi
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index bf4bca8d69..255df7accd 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Common X11 scripts"
LICENSE = "GPL"
SECTION = "x11"
-PR = "r41"
+PR = "r42"
SRC_URI = "\
file://Xdefaults \