diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-03-09 12:48:45 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-03-09 12:48:45 +0000 |
commit | 7a5b04186e9dd5e7fa9bd4b03eaf1ace8b0ab77d (patch) | |
tree | 631d8a12a4def548cb73779c88774f1a1b681ac2 /meta/packages | |
parent | 88d8974bd5b4445e2789b6f2f0dd8578d9c37922 (diff) | |
parent | 84f0e3128b1ac1d2299e0a3ebb7117c775dfe16f (diff) | |
download | openembedded-core-7a5b04186e9dd5e7fa9bd4b03eaf1ace8b0ab77d.tar.gz openembedded-core-7a5b04186e9dd5e7fa9bd4b03eaf1ace8b0ab77d.tar.bz2 openembedded-core-7a5b04186e9dd5e7fa9bd4b03eaf1ace8b0ab77d.zip |
Merge commit '84f0e3128b1ac1d2299e0a3ebb7117c775dfe16f'
Diffstat (limited to 'meta/packages')
-rw-r--r-- | meta/packages/dbus/dbus-native_1.2.4.bb | 2 | ||||
-rw-r--r-- | meta/packages/dbus/dbus.inc | 2 | ||||
-rw-r--r-- | meta/packages/dbus/dbus_1.2.4.bb | 3 |
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 " |