summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-03 21:49:49 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-03 22:05:45 +0200
commite10aead5714b4b3d4b2b7f1ecb2c1ffee645c1c9 (patch)
treec08d2205dc96d662827a3fcca7c7bbad869becd4 /recipes
parent653df48c2da367e7389ed61cff6c71dc759c9543 (diff)
xserver-common_1.33: add xserver-system include for possible modifications on target
* requested by Joachim Ott * also fix 89xTs_Calibrate_xinput_calibrator, never call exit from Xsession.d script, because they are sourced to main Xsession shell and exit will end whole Xsession execution Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch3
-rw-r--r--recipes/xserver-common/files/Xserver.add.xserver-system.patch12
-rw-r--r--recipes/xserver-common/xserver-common_1.33.bb3
3 files changed, 15 insertions, 3 deletions
diff --git a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
index 6de221f865..0409a1faef 100644
--- a/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
+++ b/recipes/xserver-common/files/89xTs_Calibrate.xinput_calibrator.patch
@@ -2,7 +2,7 @@ Index: xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator
===================================================================
--- xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0)
+++ xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator (revision 0)
-@@ -0,0 +1,35 @@
+@@ -0,0 +1,34 @@
+#!/bin/sh
+
+SYSFS_CALIBRATION_DIR=/sys/bus/i2c/devices/0-0073/s3c2440-ts/calibration
@@ -35,6 +35,5 @@ Index: xserver-common/X11/Xsession.d/89xTs_Calibrate_xinput_calibrator
+ else
+ /usr/bin/xinput_calibrator_once.sh
+ fi
-+ exit
+ fi
+fi
diff --git a/recipes/xserver-common/files/Xserver.add.xserver-system.patch b/recipes/xserver-common/files/Xserver.add.xserver-system.patch
new file mode 100644
index 0000000000..5d9d5d128d
--- /dev/null
+++ b/recipes/xserver-common/files/Xserver.add.xserver-system.patch
@@ -0,0 +1,12 @@
+diff -uNr xserver-common-1.33.orig//X11/xserver-common xserver-common-1.33/X11/xserver-common
+--- xserver-common-1.33.orig//X11/xserver-common 2010-04-28 23:27:10.000000000 +0200
++++ xserver-common-1.33/X11/xserver-common 2010-04-28 23:29:07.000000000 +0200
+@@ -192,3 +196,8 @@
+ if [ "$XSERVER" != "Xorg" ] ; then
+ ARGS="$ARGS $MOUSE"
+ fi
++
++# let a local script modify the variables
++if [ -e /etc/X11/xserver-system ] ; then
++ . /etc/X11/xserver-system
++fi
diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb
index 8da0a63906..44e3183328 100644
--- a/recipes/xserver-common/xserver-common_1.33.bb
+++ b/recipes/xserver-common/xserver-common_1.33.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r1"
+PR = "r2"
PACKAGE_ARCH = "all"
DEFAULT_PREFERENCE = "-1"
@@ -27,6 +27,7 @@ RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch;patch=1 \
file://90xXWindowManager.patch;patch=1 \
file://Xserver.add.nocursor.for.gta.patch;patch=1 \
+ file://Xserver.add.xserver-system.patch;patch=1 \
file://Xserver.add.dpi.for.gta.patch;patch=1"
do_install_append() {