diff options
author | Wolfgang Denk <wd@denx.de> | 2011-01-27 12:42:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-18 16:41:25 +0000 |
commit | 0d3591db9c93cf0a863b202b3a4bb417db21b6cc (patch) | |
tree | 580fd5e48830eeef209d5d09bc623c94c235b0e7 | |
parent | 753f79806b086b020b021179d264483f1b43f491 (diff) | |
download | poky-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/Xsession | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/x11-common/x11-common_0.1.bb | 2 |
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 a87447a879..0b73127ae1 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 | ||
3 | if [ -x /usr/bin/dbus-launch ]; then | 3 | if [ -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" |
7 | fi | 7 | fi |
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 6791f961a1..5b6e947e09 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" | |||
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPLv2" |
3 | SECTION = "x11" | 3 | SECTION = "x11" |
4 | RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor" | 4 | RDEPENDS_${PN} = "xmodmap xdpyinfo xtscal xinit formfactor" |
5 | PR = "r38" | 5 | PR = "r39" |
6 | 6 | ||
7 | SRC_URI = "file://etc" | 7 | SRC_URI = "file://etc" |
8 | S = ${WORKDIR} | 8 | S = ${WORKDIR} |