| commit | 592c1588515d4c69265111e94793f05af1d45273 | [log] [tgz] |
|---|---|---|
| author | Oleksandr Tymoshenko <ovt@google.com> | Fri Mar 19 22:12:22 2021 +0000 |
| committer | Oleksandr Tymoshenko <ovt@google.com> | Mon Mar 22 17:23:02 2021 +0000 |
| tree | a207c260c197cd2492300d2e74710e43c7adb8a0 | |
| parent | a141c761ae4e028eba7f1c5be1bedd5229795705 [diff] |
project-lakitu: use correct serial console device on ARM64 Use ttyAMA1 device on ARM as a serial console where there are no ttySx devices. BUG=b/179817368 TEST=presubmit RELEASE_NOTE=None Change-Id: I1f0062e8d0d2a213a9d70b40c11084c0584268b2 Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/14556 Reviewed-by: Roy Yang <royyang@google.com> Reviewed-by: Ke Wu <mikewu@google.com> Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1-r5.ebuild b/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1-r6.ebuild similarity index 100% rename from project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1-r5.ebuild rename to project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1-r6.ebuild
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1.ebuild b/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1.ebuild index 930aa26..ea9f4eb 100644 --- a/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1.ebuild +++ b/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1.ebuild
@@ -19,6 +19,14 @@ sys-apps/systemd " +getty_console() { + case ${ARCH} in + amd64) echo "ttyS1";; + arm64) echo "ttyAMA1";; + *) eerror "unsupported architecture: ${ARCH}";; + esac +} + S="${WORKDIR}" src_install() { @@ -28,5 +36,5 @@ systemd_newtmpfilesd "${FILESDIR}"/dev-image.tmpfiles dev-image.conf - use serial-getty && systemd_enable_service getty.target serial-getty@ttyS1.service + use serial-getty && systemd_enable_service getty.target serial-getty@$(getty_console).service }