summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-01-27 11:42:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-18 16:41:25 (GMT)
commit0d3591db9c93cf0a863b202b3a4bb417db21b6cc (patch)
tree580fd5e48830eeef209d5d09bc623c94c235b0e7
parent753f79806b086b020b021179d264483f1b43f491 (diff)
downloadpoky-laverne.tar.gz
x11-common: Fix unusable serial consolelaverne
The serial console port is basicly unusable in images containing X. Login works fine, but at the shell prompt only one out of N input characters (N usually between 2 and 10) gets through to the shell. dbus-launch (running as "dbus-launch --sh-syntax --exit-with-session") is also reading from /dev/console and "eating" the missing characters. As soon as I stop the Xserver ("sh /etc/init.d/xserver-nodm stop") the serial console starts wroking fine (because dbus-launch is not running any more). This patch addresses the problem. Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession2
-rw-r--r--meta/recipes-graphics/x11-common/x11-common_0.1.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
index a87447a..0b73127 100644
--- a/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
+++ b/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession
@@ -2,7 +2,7 @@
2 2
3if [ -x /usr/bin/dbus-launch ]; then 3if [ -x /usr/bin/dbus-launch ]; then
4 # As this is the X session script, always start a new DBus session. 4 # As this is the X session script, always start a new DBus session.
5 eval `dbus-launch --sh-syntax --exit-with-session` 5 eval `dbus-launch --sh-syntax --exit-with-session </dev/null`
6 echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS" 6 echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
7fi 7fi
8 8
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 6791f96..5b6e947 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor" 4RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor"
5PR = "r38" 5PR = "r39"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${WORKDIR}