diff options
author | Denys Dmytriyenko <denys@ti.com> | 2018-03-02 20:46:50 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-04 21:23:03 +0000 |
commit | 55baf5b707ada71d9e1b924b2793064012a3ed41 (patch) | |
tree | d643bbe414c620970aaecea10871656ef4027d8d /meta/recipes-core/busybox/busybox.inc | |
parent | 4e884c8723cf2e3e89d6ac412fb472e64e51bac1 (diff) | |
download | poky-55baf5b707ada71d9e1b924b2793064012a3ed41.tar.gz |
busybox: separate inittab into own package, due to SERIAL_CONSOLES being machine-specific
* Create busybox-inittab recipe to produce machine-specific package with /etc/inittab
and necessary getty calls for a machine, based on SERIAL_CONSOLES, similar to how
sysvinit-inittab was done
* Since CONFIG_FEATURE_USE_INITTAB is controlled by VIRTUAL-RUNTIME_init_manager, make
main busybox package RDEPENDS on busybox-inittab when init_manager is set to busybox
(From OE-Core rev: afb09abd2f0f7555ba156260a87fd3867f591310)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/busybox.inc')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 157aea3968..ac6d7ca262 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -48,6 +48,8 @@ CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" | |||
48 | 48 | ||
49 | RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" | 49 | RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" |
50 | 50 | ||
51 | RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" | ||
52 | |||
51 | inherit cml1 systemd update-rc.d ptest | 53 | inherit cml1 systemd update-rc.d ptest |
52 | 54 | ||
53 | # internal helper | 55 | # internal helper |
@@ -310,16 +312,6 @@ do_install () { | |||
310 | install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS | 312 | install -D -m 0777 ${WORKDIR}/rcS ${D}${sysconfdir}/init.d/rcS |
311 | install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK | 313 | install -D -m 0777 ${WORKDIR}/rcK ${D}${sysconfdir}/init.d/rcK |
312 | install -D -m 0755 ${WORKDIR}/runlevel ${D}${base_sbindir}/runlevel | 314 | install -D -m 0755 ${WORKDIR}/runlevel ${D}${base_sbindir}/runlevel |
313 | if grep "CONFIG_FEATURE_USE_INITTAB=y" ${B}/.config; then | ||
314 | install -D -m 0777 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab | ||
315 | tmp="${SERIAL_CONSOLES}" | ||
316 | for i in $tmp | ||
317 | do | ||
318 | j=`echo ${i} | sed s/\;/\ /g` | ||
319 | id=`echo ${i} | sed -e 's/^.*;//' -e 's/;.*//'` | ||
320 | echo "$id::respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab | ||
321 | done | ||
322 | fi | ||
323 | fi | 315 | fi |
324 | 316 | ||
325 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 317 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |