CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

busybox: fix upgrade path

Browse Source 
* 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@gmail.com>
This commit is contained in:
Martin Jansa 2013-04-14 17:37:08 +02:00
parent 65401d4785
commit 9e192db23a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-systemd/oe-core/recipes-core/busybox/busybox_1.20.2.bbappend
View File

@ -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"