summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-08-19 20:36:27 +0000
committerRichard Purdie <richard@openedhand.com>2008-08-19 20:36:27 +0000
commit37d9ffa5d40ae81d7f11d199d8130933090dba03 (patch)
tree8c0476d05e7364a68f494214268f5b4faf385b16
parente80d0ca6b67dfed845cb8e21d942c3452dfe76f1 (diff)
downloadpoky-37d9ffa5d40ae81d7f11d199d8130933090dba03.tar.gz
dbus: Add volatiles configuration
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5080 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/dbus/dbus-1.0.3/99_dbus1
-rw-r--r--meta/packages/dbus/dbus-1.1.20/99_dbus1
-rw-r--r--meta/packages/dbus/dbus.inc4
-rw-r--r--meta/packages/dbus/dbus_1.1.20.bb2
4 files changed, 7 insertions, 1 deletions
diff --git a/meta/packages/dbus/dbus-1.0.3/99_dbus b/meta/packages/dbus/dbus-1.0.3/99_dbus
new file mode 100644
index 0000000000..6821ae4dba
--- /dev/null
+++ b/meta/packages/dbus/dbus-1.0.3/99_dbus
@@ -0,0 +1 @@
d messagebus messagebus 0755 /var/run/dbus none
diff --git a/meta/packages/dbus/dbus-1.1.20/99_dbus b/meta/packages/dbus/dbus-1.1.20/99_dbus
new file mode 100644
index 0000000000..6821ae4dba
--- /dev/null
+++ b/meta/packages/dbus/dbus-1.1.20/99_dbus
@@ -0,0 +1 @@
d messagebus messagebus 0755 /var/run/dbus none
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 1881cfb90e..08659a997b 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -9,6 +9,7 @@ SRC_URI = "\
9 file://cross.patch;patch=1 \ 9 file://cross.patch;patch=1 \
10 file://tmpdir.patch;patch=1 \ 10 file://tmpdir.patch;patch=1 \
11 file://dbus-1.init \ 11 file://dbus-1.init \
12 file://99_dbus \
12" 13"
13S = "${WORKDIR}/dbus-${PV}" 14S = "${WORKDIR}/dbus-${PV}"
14 15
@@ -80,6 +81,9 @@ do_stage() {
80} 81}
81 82
82do_install_append() { 83do_install_append() {
84 install -d ${D}/etc/default/volatiles
85 install -m 0644 ${WORKDIR}/99_dbus ${D}/etc/default/volatiles/
86
83 install -d ${D}${sysconfdir}/init.d 87 install -d ${D}${sysconfdir}/init.d
84 install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1 88 install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
85 # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M: 89 # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
diff --git a/meta/packages/dbus/dbus_1.1.20.bb b/meta/packages/dbus/dbus_1.1.20.bb
index 456b8ee99b..1f838de30e 100644
--- a/meta/packages/dbus/dbus_1.1.20.bb
+++ b/meta/packages/dbus/dbus_1.1.20.bb
@@ -1,6 +1,6 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r4" 3PR = "r5"
4 4
5SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1 \ 5SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1 \
6 file://fix-install-daemon.patch;patch=1 " 6 file://fix-install-daemon.patch;patch=1 "