summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-04-07 14:14:48 +0000
committerRoss Burton <ross@openedhand.com>2008-04-07 14:14:48 +0000
commitea0ec5af1ab62effab3cd3c5a7c5fb6016f78dea (patch)
tree8183565e6272d0c914fc27127d2fb7e29e3d2557
parentf29e0adb569be164bd7a29920db686839def9890 (diff)
downloadpoky-ea0ec5af1ab62effab3cd3c5a7c5fb6016f78dea.tar.gz
xserver-kdrive-common: always start a session bus when X starts, as X is the session
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4179 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession9
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb2
2 files changed, 4 insertions, 7 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
index cfa86fa135..ccda4b65ad 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
@@ -7,12 +7,9 @@ HOME=/home/$USER
7export HOME 7export HOME
8 8
9if [ -f /usr/bin/dbus-launch ]; then 9if [ -f /usr/bin/dbus-launch ]; then
10 ## test for an existing bus daemon, just to be safe 10 # As this is the X session script, always start a new DBus session.
11 if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then 11 eval `dbus-launch --sh-syntax --exit-with-session`
12 ## if not found, launch a new one 12 echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
13 eval `dbus-launch --auto-syntax --exit-with-session`
14 echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
15 fi
16fi 13fi
17 14
18. /etc/profile 15. /etc/profile
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 46b7484090..5419842692 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor" 4RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
5PR = "r24" 5PR = "r25"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${WORKDIR}