diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-14 17:34:42 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:06 +0200 |
| commit | 65401d478557b6d65a7130bb9b371e06bf34a391 (patch) | |
| tree | 612ee5dce6b81cef233b5e89632872290e6e03b4 /meta-systemd | |
| parent | b4cb81b1c9be83fb50342d5ba6ba29aa2ce721a6 (diff) | |
| download | meta-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')
| -rw-r--r-- | meta-systemd/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 000000000..e90c55544 --- /dev/null +++ b/meta-systemd/oe-core/recipes-core/dbus/dbus_1.6.8.bbappend | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | PRINC := "${@int(PRINC) + 1}" | ||
| 2 | |||
| 3 | RPROVIDES_${PN} += "${PN}-systemd" | ||
| 4 | RREPLACES_${PN} += "${PN}-systemd" | ||
| 5 | RCONFLICTS_${PN} += "${PN}-systemd" | ||