[oe-commits] [openembedded-core] 03/14: busybox-inittab/sysvinit-inittab: add rconflicts

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 6bac102b0c16df3e880ff51ef7033e5ca8fce1cd
Author: Changqing Li <changqing.li at windriver.com>
AuthorDate: Wed May 29 17:00:00 2019 +0800

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/busybox/busybox-inittab_1.30.1.bb    | 2 ++
 meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 3 +--
 2 files changed, 3 insertions(+), 2 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 a83620e..c347daf 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"
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index bfd890d..8781492 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -90,5 +90,4 @@ CONFFILES_${PN} = "${sysconfdir}/inittab"
 USE_VT ?= "1"
 SYSVINIT_ENABLED_GETTYS ?= "1"
 
-
-
+RCONFLICTS_${PN} = "busybox-inittab"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.