diff options
author | Changqing Li <changqing.li@windriver.com> | 2019-05-29 17:00:00 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-30 12:37:03 +0100 |
commit | e9e7102fe2edb0c55d64043e5eb050fbee5f4445 (patch) | |
tree | cbdfcb21067fc7200f1ef2ee799a03bf6d1e2426 /meta | |
parent | d365948ebd76625f82ef04e77d35bcfeced42fec (diff) | |
download | poky-e9e7102fe2edb0c55d64043e5eb050fbee5f4445.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
(From OE-Core rev: d66114b07ef3e8482fee4c3c93e4f6324c38da3b)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/busybox/busybox-inittab_1.30.1.bb | 2 | ||||
-rw-r--r-- | 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 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}" | |||
30 | 30 | ||
31 | FILES_${PN} = "${sysconfdir}/inittab" | 31 | FILES_${PN} = "${sysconfdir}/inittab" |
32 | CONFFILES_${PN} = "${sysconfdir}/inittab" | 32 | CONFFILES_${PN} = "${sysconfdir}/inittab" |
33 | |||
34 | 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 bfd890d924..8781492d47 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" | |||
90 | USE_VT ?= "1" | 90 | USE_VT ?= "1" |
91 | SYSVINIT_ENABLED_GETTYS ?= "1" | 91 | SYSVINIT_ENABLED_GETTYS ?= "1" |
92 | 92 | ||
93 | 93 | RCONFLICTS_${PN} = "busybox-inittab" | |
94 | |||