From 18e2967aabf45a171acfd0485b4bd7a4f700ebf8 Mon Sep 17 00:00:00 2001
From: Diego Sueiro <diego.sueiro@arm.com>
Date: Thu, 6 May 2021 16:50:57 +0100
Subject: [PATCH] arm-autonomy/sysvinit-inittab: Fix console login for host and
 guest

In meta-virtualization master branch the sysvinit-inittab_virtualization.inc
was introduced to handle the installation of the getty-wrapper for spawing the
console login for /dev/hvc0.

Since we don't make usage of the virtualization DISTRO_FEATURES we have to
manually include the mentioned file when building with arm-autonomy-host and
arm-autonomy-guest DISTRO_FEATURES.

Also, since arm-autonomy-guest doesn't include the xen DISTRO_FEATURES we have
to manually include sysvinit-inittab_xen.inc to append the getty-wrapper entry
to /etc/inittab.

Issue-Id: SCM-2329
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Change-Id: I0f92565de8a9053c0541928c30b8f979757bfbca
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../sysvinit/sysvinit-inittab_2.%.bbappend    | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend b/meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
index 7b0c6472..e30e9648 100644
--- a/meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
+++ b/meta-arm-autonomy/recipes-core/sysvinit/sysvinit-inittab_2.%.bbappend
@@ -1,16 +1,20 @@
-# if arm-autonomy-guest is activated, we are running as a xen guest so we must
-# have a console on hvc0
-# This is normally done in meta-virtualization if xen is activated but here
-# we don't have xen activated.
-#
+# if arm-autonomy-host or arm-autonomy-guest are activated, we need to install
+# the getty-wrapper to spawn the login console on /dev/hvc0.
+# This is normally done in meta-virtualization if virtualization and xen
+# DISTRO_FEATURES are activated.
 
-SYSVINIT_ADDHVC0 = "${@bb.utils.contains('DISTRO_FEATURES', \
-    'arm-autonomy-guest', 'true', 'false', d)}"
+# In both arm-autonomy-host and arm-autonomy-guest we don't have virtualization
+# in DISTRO_FEATURE. Hence, manually include sysvinit-inittab_virtualization.inc
+# to install the getty-wrapper.
+require ${@bb.utils.contains_any('DISTRO_FEATURES', \
+                                 'arm-autonomy-host arm-autonomy-guest', \
+                                 'recipes-core/sysvinit/sysvinit-inittab_virtualization.inc', \
+                                 '', d)}
 
-do_install_append() {
-    if ${SYSVINIT_ADDHVC0}; then
-        echo "" >> ${D}${sysconfdir}/inittab
-        echo "X0:12345:respawn:/sbin/getty 115200 hvc0" >> \
-            ${D}${sysconfdir}/inittab
-    fi
-}
+# For arm-autonomy-guest we don't have xen in DISTRO_FEATURES. Hence, manually
+# include sysvinit-inittab_xen.inc to append the getty-wrapper entry to
+# /etc/inittab.
+require ${@bb.utils.contains('DISTRO_FEATURES', \
+                             'arm-autonomy-guest', \
+                             'recipes-core/sysvinit/sysvinit-inittab_xen.inc', \
+                             '', d)}