busybox: fix upgrade path
PATCH 1/1 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 <[email protected]>
--- meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend +5 -1
@@ -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"
Signature · 1 line
1.8.1.5