[oe-commits] Martin Jansa : dbus: add bbappend to fix upgrade path

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 65401d478557b6d65a7130bb9b371e06bf34a391
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=65401d478557b6d65a7130bb9b371e06bf34a391

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Apr 14 17:34:42 2013 +0200

dbus: add bbappend to fix upgrade path

 * check_data_file_clashes: Package dbus-1 wants to install file /lib/systemd/system/multi-user.target.wants/dbus.service
        But that file is already provided by package  * dbus-systemd
 * check_data_file_clashes: Package dbus-1 wants to install file /lib/systemd/system/dbus.socket
        But that file is already provided by package  * dbus-systemd
 * check_data_file_clashes: Package dbus-1 wants to install file /lib/systemd/system/sockets.target.wants/dbus.socket
        But that file is already provided by package  * dbus-systemd

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../oe-core/recipes-core/dbus/dbus_1.6.8.bbappend  |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta-systemd/oe-core/recipes-core/dbus/dbus_1.6.8.bbappend b/meta-systemd/oe-core/recipes-core/dbus/dbus_1.6.8.bbappend
new file mode 100644
index 0000000..e90c555
--- /dev/null
+++ b/meta-systemd/oe-core/recipes-core/dbus/dbus_1.6.8.bbappend
@@ -0,0 +1,5 @@
+PRINC := "${@int(PRINC) + 1}"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"