summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/busybox
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2019-05-29 17:00:00 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-30 12:34:56 +0100
commitd66114b07ef3e8482fee4c3c93e4f6324c38da3b (patch)
treeade24f5fb37e902e6cb68501c455b0fcab3b8982 /meta/recipes-core/busybox
parent0aa21ae925d81cd10d5c44d4d98c9f06df87139d (diff)
downloadopenembedded-core-contrib-d66114b07ef3e8482fee4c3c93e4f6324c38da3b.tar.gz
busybox-inittab/sysvinit-inittab: add rconflicts
when both installed, do_rootfs report error like: file /etc/inittab conflicts between attempted installs of busybox-inittab-1.30.1-r0.qemux86 and sysvinit-inittab-2.88dsf-r10.qemux86 so add each other to rconflicts Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r--meta/recipes-core/busybox/busybox-inittab_1.30.1.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox-inittab_1.30.1.bb b/meta/recipes-core/busybox/busybox-inittab_1.30.1.bb
index a83620e859..c347daf501 100644
--- a/meta/recipes-core/busybox/busybox-inittab_1.30.1.bb
+++ b/meta/recipes-core/busybox/busybox-inittab_1.30.1.bb
@@ -30,3 +30,5 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
FILES_${PN} = "${sysconfdir}/inittab"
CONFFILES_${PN} = "${sysconfdir}/inittab"
+
+RCONFLICTS_${PN} = "sysvinit-inittab"