[oe-commits] Martin Jansa : busybox: fix upgrade path

[git at git.openembedded.org]

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

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

busybox: fix upgrade path

 * check_data_file_clashes: Package busybox-syslog wants to install file /lib/systemd/system/busybox-syslog.service
        But that file is already provided by package  * busybox-syslog-systemd
 * check_data_file_clashes: Package busybox-syslog wants to install file /lib/systemd/system/syslog.service
        But that file is already provided by package  * busybox-syslog-systemd
 * check_data_file_clashes: Package busybox-syslog wants to install file /lib/systemd/system/busybox-klogd.service
        But that file is already provided by package  * busybox-syslog-systemd

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

---

 .../recipes-core/busybox/busybox_1.20.2.bbappend   |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend b/meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
index 0699302..cd6acc8 100644
--- a/meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
+++ b/meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
@@ -1,6 +1,6 @@
 inherit systemd
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
 
 # look for files in the layer first
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -21,3 +21,7 @@ do_install_append() {
 	ln -sf /dev/null ${D}${systemd_unitdir}/system/syslog.service
 }
 FILES_${PN}-syslog += "${systemd_unitdir}/system/syslog.service"
+
+RPROVIDES_${PN}-syslog += "${PN}-syslog-systemd"
+RREPLACES_${PN}-syslog += "${PN}-syslog-systemd"
+RCONFLICTS_${PN}-syslog += "${PN}-syslog-systemd"