mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-08 19:33:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix winetricks install and build new container

Browse source 
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 <denniskempin@google.com>
Reviewed-by: Vikram Auradkar <auradkar@google.com>
Commit-Queue: Vikram Auradkar <auradkar@google.com>
This commit is contained in:
Dennis Kempin 2022-10-31 21:06:07 +00:00 committed by crosvm LUCI
parent 4eed9244b5
commit b28d5a963d
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/impl/dev_container/entrypoint.sh
View file

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

2
tools/impl/dev_container/version
View file

@ -1 +1 @@
r0027
r0028

3
tools/install-wine-deps
View file

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