From b28d5a963dee0b83b1a5ce6e20574e8e7d6aefba Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Mon, 31 Oct 2022 21:06:07 +0000 Subject: [PATCH] Fix winetricks install and build new container Uprevs the container version to include the newly added winetricks. Fixes /dev/kvm permissions. BUG=None TEST=CQ Change-Id: I019178f103068d3ae0dc048180a14c8786e738e0 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3994884 Auto-Submit: Dennis Kempin Reviewed-by: Vikram Auradkar Commit-Queue: Vikram Auradkar --- tools/impl/dev_container/entrypoint.sh | 2 +- tools/impl/dev_container/version | 2 +- tools/install-wine-deps | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/impl/dev_container/entrypoint.sh b/tools/impl/dev_container/entrypoint.sh index 2d939615f3..3395f40cf6 100755 --- a/tools/impl/dev_container/entrypoint.sh +++ b/tools/impl/dev_container/entrypoint.sh @@ -7,7 +7,7 @@ flock /tmp/entrypoint_lock /tools/setup-user.sh # Give KVM device correct permission -if [ -f "/dev/kvm" ]; then +if [ -e "/dev/kvm" ]; then chmod 666 /dev/kvm fi diff --git a/tools/impl/dev_container/version b/tools/impl/dev_container/version index 52b3a48327..1329f6f4a3 100644 --- a/tools/impl/dev_container/version +++ b/tools/impl/dev_container/version @@ -1 +1 @@ -r0027 +r0028 diff --git a/tools/install-wine-deps b/tools/install-wine-deps index 5961837d28..d431f8f883 100755 --- a/tools/install-wine-deps +++ b/tools/install-wine-deps @@ -11,7 +11,7 @@ WINESTRICKS_SCRIPT_SHA="40fdf1f89f3636187201858e3591e86752172814" # Setup wine windows prebuilt dependecies. export WINEARCH=win64 export WINE=wine64 -sudo wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks -O winetricks +sudo wget "$WINETRICKS_URL" -O winetricks echo "$WINESTRICKS_SCRIPT_SHA winetricks" | sha1sum -c - sudo chmod +x winetricks @@ -22,4 +22,3 @@ sudo chmod +x winetricks ./winetricks --force vcrun2015 || true ln -fs ~/.wine/drive_c/windows/system32/ucrtbase.dll ~/.wine/drive_c/windows/system32/ucrtbased.dll ln -fs ~/.wine/drive_c/windows/system32/vcruntime140.dll ~/.wine/drive_c/windows/system32/vcruntime140d.dll -