From 10d0a824ad9b835b6f5ec24a49d41aead613031b Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 30 May 2019 13:32:20 +0800 Subject: systemd: add rconflicts add rconflicts since error during do_rootfs: file /sbin/resolvconf conflicts between attempted installs of resolvconf-1.79-r0.noarch and systemd-1:242+0+db2e367bfc-r0.i586 file /sbin/init conflicts between attempted installs of tiny-init-1.0-r3.i586 and systemd-1:242+0+db2e367bfc-r0.i586 Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_242.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/recipes-core/systemd') diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index 93a23dd987..90f235be3d 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/meta/recipes-core/systemd/systemd_242.bb @@ -603,6 +603,8 @@ FILES_udev += "${base_sbindir}/udevd \ FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d" +RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" + INITSCRIPT_PACKAGES = "udev" INITSCRIPT_NAME_udev = "systemd-udevd" INITSCRIPT_PARAMS_udev = "start 03 S ." -- cgit 1.2.3-korg