aboutsummaryrefslogtreecommitdiffstats
path: root/meta-systemd/oe-core
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-14 17:34:42 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:06 +0200
commit65401d478557b6d65a7130bb9b371e06bf34a391 (patch)
tree612ee5dce6b81cef233b5e89632872290e6e03b4 /meta-systemd/oe-core
parentb4cb81b1c9be83fb50342d5ba6ba29aa2ce721a6 (diff)
downloadmeta-openembedded-65401d478557b6d65a7130bb9b371e06bf34a391.tar.gz
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@gmail.com>
Diffstat (limited to 'meta-systemd/oe-core')
-rw-r--r--meta-systemd/oe-core/recipes-core/dbus/dbus_1.6.8.bbappend5
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 0000000000..e90c555444
--- /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"