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 <denniskempin@google.com>
Auto-Submit: Zihan Chen <zihanchen@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
Zihan Chen 2023-03-21 16:39:16 -07:00 committed by crosvm LUCI
parent 1692183e4c
commit 894cf79ba0
4 changed files with 6 additions and 2 deletions

View file

@ -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 \

View file

@ -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

View file

@ -1 +1 @@
r0037
r0038

View file

@ -49,6 +49,7 @@ sudo apt-get install --yes --no-install-recommends \
qemu-system-x86 \
rsync \
screen \
strace \
tmux \
wayland-protocols \
wget