summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-01-24 15:43:32 +0000
committerRoss Burton <ross@openedhand.com>2008-01-24 15:43:32 +0000
commitfb8b73f480bfd1ebfec34f7bcb1ecb79178b63ba (patch)
tree9b5b4ca855e4afe02a61b3a0e8e66863e6d6dad2 /meta/packages
parent9cf26bdf1b0cb0a83f6e6fee921bba5294903b1b (diff)
downloadpoky-fb8b73f480bfd1ebfec34f7bcb1ecb79178b63ba.tar.gz
gconf-dbus: don't start in the X session, gconf can be autostarted
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3584 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rwxr-xr-xmeta/packages/gnome/gconf-dbus/69gconfd-dbus3
-rw-r--r--meta/packages/gnome/gconf-dbus_svn.bb10
2 files changed, 2 insertions, 11 deletions
diff --git a/meta/packages/gnome/gconf-dbus/69gconfd-dbus b/meta/packages/gnome/gconf-dbus/69gconfd-dbus
deleted file mode 100755
index c2add042f6..0000000000
--- a/meta/packages/gnome/gconf-dbus/69gconfd-dbus
+++ /dev/null
@@ -1,3 +0,0 @@
1#!/bin/sh
2
3/usr/libexec/gconfd-2 &
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb
index cc69079c3a..0159aaa573 100644
--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -9,8 +9,7 @@ RPROVIDES_${PN}-dev = "gconf-dev"
9PV = "2.16.0+svnr${SRCREV}" 9PV = "2.16.0+svnr${SRCREV}"
10PR = "r4" 10PR = "r4"
11 11
12SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ 12SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
13 file://69gconfd-dbus"
14 13
15inherit pkgconfig autotools 14inherit pkgconfig autotools
16S = "${WORKDIR}/trunk" 15S = "${WORKDIR}/trunk"
@@ -20,7 +19,7 @@ PARALLEL_MAKE = ""
20FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" 19FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
21FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" 20FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
22 21
23EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static" 22EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes"
24 23
25 24
26do_configure_prepend() { 25do_configure_prepend() {
@@ -31,8 +30,3 @@ do_stage() {
31 autotools_stage_all 30 autotools_stage_all
32 install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 31 install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
33} 32}
34
35do_install_append () {
36 install -d ${D}/${sysconfdir}/X11/Xsession.d
37 install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
38}