summaryrefslogtreecommitdiff
path: root/meta/packages/dbus
diff options
context:
space:
mode:
authorRichard Purdie <richard@ted.(none)>2009-04-28 08:24:11 +0100
committerRichard Purdie <richard@ted.(none)>2009-04-28 08:24:11 +0100
commit3927e38eba96a172c7df2c7270c31728b83612eb (patch)
tree48b0a30d721af9e2f25e03bea8e41035e9ff40bb /meta/packages/dbus
parent49ca46f588425c88e37a85df00b1fd4591a01ab6 (diff)
parentd65be3dd2aaa643b5596c8470caf7f291513efee (diff)
downloadopenembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.gz
openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.bz2
openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.tar.xz
openembedded-core-3927e38eba96a172c7df2c7270c31728b83612eb.zip
Merge ssh://gitserver@git.pokylinux.org/poky
Diffstat (limited to 'meta/packages/dbus')
-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 47e3167ed..d799ba2d1 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 68c8a842e..2efcf46b2 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 25ab98b9f..b170e7b34 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 "