summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/busybox/busybox-inittab_1.30.1.bb2
-rw-r--r--meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb3
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
31FILES_${PN} = "${sysconfdir}/inittab" 31FILES_${PN} = "${sysconfdir}/inittab"
32CONFFILES_${PN} = "${sysconfdir}/inittab" 32CONFFILES_${PN} = "${sysconfdir}/inittab"
33
34RCONFLICTS_${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"
90USE_VT ?= "1" 90USE_VT ?= "1"
91SYSVINIT_ENABLED_GETTYS ?= "1" 91SYSVINIT_ENABLED_GETTYS ?= "1"
92 92
93 93RCONFLICTS_${PN} = "busybox-inittab"
94