Make aarch64 vm usable for running armhf binaries.

BUG: b/203152778
TEST: ./tools/run_tests --target vm:aarch64; ./tools/run_tests vm:aarch64 --arch armhf
Change-Id: I5b774ebf66f1a0a71e025dc364a6e85d43d3b6cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3324410
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Anton Romanov <romanton@google.com>
This commit is contained in:
Anton Romanov 2021-12-08 22:02:43 +00:00 committed by Commit Bot
parent 91a56fe9da
commit 14e024ae4e
2 changed files with 20 additions and 1 deletions

View file

@ -1,3 +1,4 @@
## template: jinja
#cloud-config
#
# This file is responsible for setting up the test VM when it is first booted.
@ -19,6 +20,13 @@ users:
preserve_hostname: true
{% if v1.machine == 'aarch64' -%}
# This needs to run as bootcmd to preceed processing `packages` section
bootcmd:
- dpkg --add-architecture armhf
{%- endif %}
# Runtime dependencies of crosvm binaries.
# Note: Keep in sync with ./install-[aarch64-]deps.sh
packages:
@ -31,6 +39,17 @@ packages:
- libx11-6
- libxext6
- rsync
{% if v1.machine == 'aarch64' %}
# Note: Keep in sync with the above
- libcap2:armhf
- libdbus-1-3:armhf
- libdrm2:armhf
- libepoxy0:armhf
- libssl1.1:armhf
- libwayland-client0:armhf
- libx11-6:armhf
- libxext6:armhf
{%- endif %}
# Commands to run once during setup
runcmd:

View file

@ -1 +1 @@
r0001
r0002