From 894cf79ba09ea14809f8348d9597e3687f086eca Mon Sep 17 00:00:00 2001 From: Zihan Chen Date: Tue, 21 Mar 2023 16:39:16 -0700 Subject: [PATCH] dev_container: Add strace to dependency strace is used to capture seccomp profile during benchmark runs. This CL also added /usr/lib/wine to PATH as debian has decided to remove /usr/bin/wine64 alternative entry. TEST=./tools/bench --log-seccomp --log-seccomp-output-dir /workspace/seccomp_result boot TEST=./tools/run_tests --dut=host BUG=b:258316090 Change-Id: Ie362149ef77474ad7d9c9ff918a990d386d7a5ff Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4358600 Reviewed-by: Dennis Kempin Auto-Submit: Zihan Chen Commit-Queue: Dennis Kempin --- tools/impl/dev_container/Dockerfile | 3 +++ tools/impl/dev_container/Dockerfile.user | 2 +- tools/impl/dev_container/version | 2 +- tools/install-deps | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/impl/dev_container/Dockerfile b/tools/impl/dev_container/Dockerfile index 914f448a22..56ea3ad876 100644 --- a/tools/impl/dev_container/Dockerfile +++ b/tools/impl/dev_container/Dockerfile @@ -54,6 +54,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=private \ && ./install-armhf-deps \ && ./install-mingw64-deps +# Add wine64 to PATH, as debian removed alternative entry to wine64 +ENV PATH=/usr/lib/wine:$PATH + # Install an older version of binutils-mingw-w64-x86-64. The latest version is crashing when # linking crosvm. See b/265995780 RUN wget https://snapshot.debian.org/archive/debian/20230101T091029Z/pool/main/b/binutils-mingw-w64/binutils-mingw-w64-x86-64_2.38.90.20220713-2%2B9%2Bb1_amd64.deb \ diff --git a/tools/impl/dev_container/Dockerfile.user b/tools/impl/dev_container/Dockerfile.user index 5c6ccac2c9..2f833314e9 100644 --- a/tools/impl/dev_container/Dockerfile.user +++ b/tools/impl/dev_container/Dockerfile.user @@ -24,7 +24,7 @@ RUN useradd -ms /bin/bash crosvmdev \ USER crosvmdev # Prepare path to rust toolchain for crosvmdev -RUN echo 'export PATH=/workspace/tools:/cache/cargo_home/bin:/usr/local/cargo/bin:$PATH' >> /home/crosvmdev/.profile +RUN echo 'export PATH=/workspace/tools:/cache/cargo_home/bin:/usr/local/cargo/bin:/usr/lib/wine:$PATH' >> /home/crosvmdev/.profile # Re-run wine setup for this user RUN /tools/setup-wine64 diff --git a/tools/impl/dev_container/version b/tools/impl/dev_container/version index 147afb3a65..dcda77f01f 100644 --- a/tools/impl/dev_container/version +++ b/tools/impl/dev_container/version @@ -1 +1 @@ -r0037 +r0038 diff --git a/tools/install-deps b/tools/install-deps index 1e6350f6f2..d641d0b89e 100755 --- a/tools/install-deps +++ b/tools/install-deps @@ -49,6 +49,7 @@ sudo apt-get install --yes --no-install-recommends \ qemu-system-x86 \ rsync \ screen \ + strace \ tmux \ wayland-protocols \ wget