summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-11 16:09:49 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-11 16:09:49 +0000
commita0795895e317fddb212dc531e2ac8943f433c562 (patch)
treeabc2239a964b1e92c8c9d4043e6d78610ccb9628
parente49fcdcc8b1855368b33b4510d1030702926d720 (diff)
downloadpoky-a0795895e317fddb212dc531e2ac8943f433c562.tar.gz
xserver-nodm-init: Make sure kdrive servers have the console keyboard enabled
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/x11-common/x11-common/etc/X11/Xserver8
-rw-r--r--meta/packages/x11-common/xserver-nodm-init.bb4
2 files changed, 4 insertions, 8 deletions
diff --git a/meta/packages/x11-common/x11-common/etc/X11/Xserver b/meta/packages/x11-common/x11-common/etc/X11/Xserver
index 9a0986ad61..3d4aa74b95 100644
--- a/meta/packages/x11-common/x11-common/etc/X11/Xserver
+++ b/meta/packages/x11-common/x11-common/etc/X11/Xserver
@@ -30,12 +30,9 @@ ARGS=" -br -pn"
30 30
31if [ "$XSERVER" != "/usr/bin/Xorg" ]; then 31if [ "$XSERVER" != "/usr/bin/Xorg" ]; then
32 32
33 . /etc/formfactor/config 33 . /etc/formfactor/config
34 34
35 # use ucb 1x00 touchscreen if present 35 ARGS="$ARGS -keybd keyboard"
36 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
37 ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
38 fi
39 36
40 # use usb mouse if present 37 # use usb mouse if present
41 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then 38 if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ]; then
@@ -78,4 +75,3 @@ fi
78DISPLAY=':0' 75DISPLAY=':0'
79 76
80exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* 77exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $*
81
diff --git a/meta/packages/x11-common/xserver-nodm-init.bb b/meta/packages/x11-common/xserver-nodm-init.bb
index c9efb71b81..c77b2f0f8b 100644
--- a/meta/packages/x11-common/xserver-nodm-init.bb
+++ b/meta/packages/x11-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4PRIORITY = "optional" 4PRIORITY = "optional"
5PR = "r21" 5PR = "r22"
6RDEPENDS_${PN} = "dbus-wait sudo" 6RDEPENDS_${PN} = "dbus-wait sudo"
7 7
8SRC_URI = "file://xserver-nodm" 8SRC_URI = "file://xserver-nodm"
@@ -14,7 +14,7 @@ do_install() {
14 install -d ${D}/etc 14 install -d ${D}/etc
15 install -d ${D}/etc/init.d 15 install -d ${D}/etc/init.d
16 install xserver-nodm ${D}/etc/init.d 16 install xserver-nodm ${D}/etc/init.d
17} 17}
18 18
19inherit update-rc.d 19inherit update-rc.d
20 20