summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin@buglabs.net>2009-02-23 20:45:46 +0100
committerMarcin Juszkiewicz <marcin@buglabs.net>2009-02-23 20:45:46 +0100
commit84f0e3128b1ac1d2299e0a3ebb7117c775dfe16f (patch)
tree5a7eec5bafda24410b47879f4da66b45865251df
parentcaa983dd4143ee54f4b012b9f4a13ed672456e0b (diff)
downloadopenembedded-core-84f0e3128b1ac1d2299e0a3ebb7117c775dfe16f.tar.gz
openembedded-core-84f0e3128b1ac1d2299e0a3ebb7117c775dfe16f.tar.bz2
openembedded-core-84f0e3128b1ac1d2299e0a3ebb7117c775dfe16f.zip
dbus: make dbus-native do not use update-rc.d (removes harmless warning)
-rw-r--r--meta/packages/dbus/dbus-native_1.2.4.bb2
-rw-r--r--meta/packages/dbus/dbus.inc2
-rw-r--r--meta/packages/dbus/dbus_1.2.4.bb3
3 files changed, 5 insertions, 2 deletions
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 47e3167eda..d799ba2d1d 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,7 +3,7 @@ inherit native
DEPENDS = "glib-2.0-native libxml2-native expat-native"
-PR = "r2"
+PR = "r3"
do_stage() {
oe_runmake install
diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 68c8a842ee..2efcf46b22 100644
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -12,7 +12,7 @@ SRC_URI = "\
file://99_dbus \
"
-inherit autotools pkgconfig update-rc.d gettext
+inherit autotools pkgconfig gettext
INITSCRIPT_NAME = "dbus-1"
INITSCRIPT_PARAMS = "start 02 5 2 . stop 20 0 1 6 ."
diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
index 25ab98b9f9..b170e7b340 100644
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ b/meta/packages/dbus/dbus_1.2.4.bb
@@ -1,4 +1,7 @@
include dbus.inc
+PR = "r1"
+
+inherit update-rc.d
SRC_URI += "file://fix-install-daemon.patch;patch=1 "