From 6ba8e155b65d446bd4f5ee695501e5b431c478c2 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 29 May 2019 17:35:05 +0800 Subject: tiny-init: add rconflicts add rconflicts since error during do_rootfs: file /sbin/init conflicts between attempted installs of tiny-init-1.0-r3.i586 and systemd-1:242+0+db2e367bfc-r0.i586 (From meta-yocto rev: 28bdd6efe8a4fff12ee169a227762ec0978dab36) Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta-poky/recipes-core/tiny-init/tiny-init.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-poky') diff --git a/meta-poky/recipes-core/tiny-init/tiny-init.bb b/meta-poky/recipes-core/tiny-init/tiny-init.bb index 4d4e34dc8b..44c8e1bf5e 100644 --- a/meta-poky/recipes-core/tiny-init/tiny-init.bb +++ b/meta-poky/recipes-core/tiny-init/tiny-init.bb @@ -28,3 +28,4 @@ do_install() { } FILES_${PN} = "/init ${sysconfdir}/rc.local.sample" +RCONFLICTS_${PN} = "systemd" -- cgit v1.2.3-54-g00ecf