summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-05-29 17:35:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-29 21:53:59 +0100
commit28bdd6efe8a4fff12ee169a227762ec0978dab36 (patch)
treea71fe3a72690461dc35ff597611359a066e1c2e3
parent8eccad46b00c3deef353f864de4a6a3b790a0e63 (diff)
downloadmeta-yocto-28bdd6efe8a4fff12ee169a227762ec0978dab36.tar.gz
meta-yocto-28bdd6efe8a4fff12ee169a227762ec0978dab36.tar.bz2
meta-yocto-28bdd6efe8a4fff12ee169a227762ec0978dab36.zip
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 Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-poky/recipes-core/tiny-init/tiny-init.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-poky/recipes-core/tiny-init/tiny-init.bb b/meta-poky/recipes-core/tiny-init/tiny-init.bb
index 4d4e34d..44c8e1b 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"