dbus-native: Apply install fix patch to ensure the version of dbus-daemon in staging...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb
index d799ba2d1d0268ca4e080f3a09cdf8edf4476fb4..425e5b29182006c19fd246cd492a4ba4d3b503c3 100644 (file)
--- a/meta/packages/dbus/dbus-native_1.2.14.bb
+++ b/meta/packages/dbus/dbus-native_1.2.14.bb
@@ -3,7 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r3"
+PR = "r4"
 
 do_stage() {
        oe_runmake install

diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index d799ba2d1d0268ca4e080f3a09cdf8edf4476fb4..425e5b29182006c19fd246cd492a4ba4d3b503c3 100644 (file)
--- 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 = "r3"
+PR = "r4"
 
 do_stage() {
        oe_runmake install

diff --git a/meta/packages/dbus/dbus.inc b/meta/packages/dbus/dbus.inc
index 7d72502ad76b12208935de72eb61de8192826d2f..f425f883ebd00ea5bea8e914f71049ccb5d50316 100644 (file)
--- a/meta/packages/dbus/dbus.inc
+++ b/meta/packages/dbus/dbus.inc
@@ -8,6 +8,7 @@ SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
+  file://fix-install-daemon.patch;patch=1 \
   file://dbus-1.init \
   file://99_dbus \
 "

diff --git a/meta/packages/dbus/dbus_1.2.14.bb b/meta/packages/dbus/dbus_1.2.14.bb
index b170e7b3400a05e511f37808c819fd5657e294cc..ae8772625a8d0062d1640dce57b1117889d6f12d 100644 (file)
--- a/meta/packages/dbus/dbus_1.2.14.bb
+++ b/meta/packages/dbus/dbus_1.2.14.bb
@@ -3,5 +3,3 @@ include dbus.inc
 PR = "r1"
 
 inherit update-rc.d
-
-SRC_URI += "file://fix-install-daemon.patch;patch=1 "

diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
index b170e7b3400a05e511f37808c819fd5657e294cc..ae8772625a8d0062d1640dce57b1117889d6f12d 100644 (file)
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ b/meta/packages/dbus/dbus_1.2.4.bb
@@ -3,5 +3,3 @@ include dbus.inc
 PR = "r1"
 
 inherit update-rc.d
-
-SRC_URI += "file://fix-install-daemon.patch;patch=1 "