diff --git a/tools/impl/dev_container/version b/tools/impl/dev_container/version index d9830c0eee..7a2addaa82 100644 --- a/tools/impl/dev_container/version +++ b/tools/impl/dev_container/version @@ -1 +1 @@ -r0009 +r0010 diff --git a/tools/impl/testvm/cloud_init.yaml b/tools/impl/testvm/cloud_init.yaml index e01f95760a..5f7fa80f3d 100644 --- a/tools/impl/testvm/cloud_init.yaml +++ b/tools/impl/testvm/cloud_init.yaml @@ -30,22 +30,28 @@ bootcmd: # Runtime dependencies of crosvm binaries. # Note: Keep in sync with ./install-[aarch64-]deps.sh packages: + - libavcodec58 + - libavutil56 - libcap2 - libdbus-1-3 - libdrm2 - libepoxy0 - libssl1.1 + - libswscale5 - libwayland-client0 - libx11-6 - libxext6 - rsync {% if v1.machine == 'aarch64' %} # Note: Keep in sync with the above + - libavcodec58:armhf + - libavutil56:armhf - libcap2:armhf - libdbus-1-3:armhf - libdrm2:armhf - libepoxy0:armhf - libssl1.1:armhf + - libswscale5:armhf - libwayland-client0:armhf - libx11-6:armhf - libxext6:armhf diff --git a/tools/impl/testvm/version b/tools/impl/testvm/version index 9742708e66..baaec99b32 100644 --- a/tools/impl/testvm/version +++ b/tools/impl/testvm/version @@ -1 +1 @@ -r0002 +r0003 diff --git a/tools/install-aarch64-deps b/tools/install-aarch64-deps index 7627482c94..dbef7132e4 100755 --- a/tools/install-aarch64-deps +++ b/tools/install-aarch64-deps @@ -7,12 +7,15 @@ set -ex sudo apt-get install --yes --no-install-recommends \ gcc-aarch64-linux-gnu \ ipxe-qemu \ + libavcodec-dev:arm64 \ + libavutil-dev:arm64 \ libc-dev:arm64 \ libcap-dev:arm64 \ libdbus-1-dev:arm64 \ libdrm-dev:arm64 \ libepoxy-dev:arm64 \ libssl-dev:arm64 \ + libswscale-dev:arm64 \ libwayland-dev:arm64 \ libxext-dev:arm64 \ qemu-efi-aarch64 \ diff --git a/tools/install-armhf-deps b/tools/install-armhf-deps index 250fab1d92..faf616e3d3 100755 --- a/tools/install-armhf-deps +++ b/tools/install-armhf-deps @@ -6,12 +6,15 @@ set -ex sudo apt-get install --yes --no-install-recommends \ gcc-arm-linux-gnueabihf \ + libavcodec-dev:armhf \ + libavutil-dev:armhf \ libc-dev:armhf \ libcap-dev:armhf \ libdbus-1-dev:armhf \ libdrm-dev:armhf \ libepoxy-dev:armhf \ libssl-dev:armhf \ + libswscale-dev:armhf \ libwayland-dev:armhf \ libxext-dev:armhf diff --git a/tools/install-deps b/tools/install-deps index 98191312b1..7c9cd53b89 100755 --- a/tools/install-deps +++ b/tools/install-deps @@ -15,11 +15,14 @@ sudo apt-get install --yes --no-install-recommends \ git \ jq \ libasound2-dev \ + libavcodec-dev \ + libavutil-dev \ libclang-dev \ libdbus-1-dev \ libdrm-dev \ libepoxy-dev \ libssl-dev \ + libswscale-dev \ libwayland-dev \ libxext-dev \ make \