From e9e7102fe2edb0c55d64043e5eb050fbee5f4445 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Wed, 29 May 2019 17:00:00 +0800 Subject: 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 (From OE-Core rev: d66114b07ef3e8482fee4c3c93e4f6324c38da3b) Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox-inittab_1.30.1.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/recipes-core/busybox') 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" -- cgit v1.2.3-54-g00ecf