[oe-commits] Richard Purdie : xserver-nodm: Disable dbus-wait as it causes users too much confusion
git version control
git at git.openembedded.org
Wed Aug 31 18:33:22 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 0471b17b061e57231387ef90c95fc0c34fc0e66b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0471b17b061e57231387ef90c95fc0c34fc0e66b
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue Aug 30 22:23:38 2011 +0100
xserver-nodm: Disable dbus-wait as it causes users too much confusion
In the event the xserver fails to start the dbus-wait has to time out and
this causes many users a lot of confusion. If we wish to reinstate this,
we need to find a safer mechanism to do it where X failing to start cancels
the timeout (sends a dbus event at that point?) The comments are left in the
file as an example in case some user does wish to enable is.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../x11-common/xserver-nodm-init.bb | 4 ++--
.../x11-common/xserver-nodm-init/xserver-nodm | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index d48f700..ea4222d 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
-PR = "r25"
-RDEPENDS_${PN} = "dbus-wait sudo"
+PR = "r26"
+RDEPENDS_${PN} = "sudo"
SRC_URI = "file://xserver-nodm \
file://Xusername \
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index 3b71983..858af0b 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
@@ -38,7 +38,8 @@ case "$1" in
# Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211]
su -l -c '/etc/X11/Xserver&' $username
# Wait for the desktop to say its finished loading
- dbus-wait org.matchbox_project.desktop Loaded
+ # before loading the rest of the system
+ # dbus-wait org.matchbox_project.desktop Loaded
;;
stop)
More information about the Openembedded-commits
mailing list