Fabio/windows-arm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Update VirtIO drivers to v0.1.262 (#176)

Browse source
This commit is contained in:
Kroese 2024-08-18 18:17:31 +02:00 committed by GitHub
parent e9d7144085
commit 7beb8e9e4f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Dockerfile
View file

@ -1,5 +1,5 @@
FROM scratch FROM scratch
COPY --from=qemux/qemu-arm:2.10 / / COPY --from=qemux/qemu-arm:2.12 / /
ARG VERSION_ARG="0.0" ARG VERSION_ARG="0.0"
ARG DEBCONF_NOWARNINGS="yes" ARG DEBCONF_NOWARNINGS="yes"
@ -28,14 +28,14 @@ COPY --chmod=755 ./src /run/
COPY --chmod=755 ./assets /run/assets COPY --chmod=755 ./assets /run/assets
ADD --chmod=755 https://raw.githubusercontent.com/christgau/wsdd/v0.8/src/wsdd.py /usr/sbin/wsdd ADD --chmod=755 https://raw.githubusercontent.com/christgau/wsdd/v0.8/src/wsdd.py /usr/sbin/wsdd
ADD --chmod=664 https://github.com/qemus/virtiso-arm/releases/download/v0.1.248/virtio-win-0.1.248.tar.xz /drivers.txz ADD --chmod=664 https://github.com/qemus/virtiso-arm/releases/download/v0.1.262/virtio-win-0.1.262.tar.xz /drivers.txz
EXPOSE 8006 3389 EXPOSE 8006 3389
VOLUME /storage VOLUME /storage
ENV RAM_SIZE "4G" ENV RAM_SIZE="4G"
ENV CPU_CORES "2" ENV CPU_CORES="2"
ENV DISK_SIZE "64G" ENV DISK_SIZE="64G"
ENV VERSION "win11" ENV VERSION="win11"
ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"] ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]

2
src/entry.sh
View file

@ -35,7 +35,7 @@ fi
(( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15 (( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15
terminal terminal
( sleep 10; boot ) & ( sleep 30; boot ) &
tail -fn +0 "$QEMU_LOG" 2>/dev/null & tail -fn +0 "$QEMU_LOG" 2>/dev/null &
cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" & cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" &
wait $! || : wait $! || :

17
src/install.sh
View file

@ -620,7 +620,7 @@ updateXML() {
[ -z "$YRES" ] && YRES="720" [ -z "$YRES" ] && YRES="720"
[ -z "$XRES" ] && XRES="1280" [ -z "$XRES" ] && XRES="1280"
sed -i "s/<VerticalResolution>1080<\/VerticalResolution>/<VerticalResolution>$YRES<\/VerticalResolution>/g" "$asset" sed -i "s/<VerticalResolution>1080<\/VerticalResolution>/<VerticalResolution>$YRES<\/VerticalResolution>/g" "$asset"
sed -i "s/<HorizontalResolution>1920<\/HorizontalResolution>/<HorizontalResolution>$XRES<\/HorizontalResolution>/g" "$asset" sed -i "s/<HorizontalResolution>1920<\/HorizontalResolution>/<HorizontalResolution>$XRES<\/HorizontalResolution>/g" "$asset"
@ -683,7 +683,7 @@ addDriver() {
"win81x64"* ) folder="w8.1/amd64" ;; "win81x64"* ) folder="w8.1/amd64" ;;
"win10x64"* ) folder="w10/amd64" ;; "win10x64"* ) folder="w10/amd64" ;;
"win11x64"* ) folder="w11/amd64" ;; "win11x64"* ) folder="w11/amd64" ;;
"win2025"* ) folder="w11/amd64" ;; "win2025"* ) folder="2k25/amd64" ;;
"win2022"* ) folder="2k22/amd64" ;; "win2022"* ) folder="2k22/amd64" ;;
"win2019"* ) folder="2k19/amd64" ;; "win2019"* ) folder="2k19/amd64" ;;
"win2016"* ) folder="2k16/amd64" ;; "win2016"* ) folder="2k16/amd64" ;;
@ -701,9 +701,16 @@ addDriver() {
[ ! -d "$path/$driver/$folder" ] && return 0 [ ! -d "$path/$driver/$folder" ] && return 0
if [[ "${id,,}" == "winvista"* ]]; then case "${id,,}" in
[[ "${driver,,}" == "viorng" ]] && return 0 "winvista"* )
fi [[ "${driver,,}" == "viorng" ]] && return 0
;;
"win2025"* | "win11x64-iot"* | "win11x64-ltsc"* )
[[ "${driver,,}" == "smbus" ]] && return 0
[[ "${driver,,}" == "pvpanic" ]] && return 0
[[ "${driver,,}" == "viogpudo" ]] && return 0
;;
esac
local dest="$path/$target/$driver" local dest="$path/$target/$driver"
mv "$path/$driver/$folder" "$dest" mv "$path/$driver/$folder" "$dest"

2
src/mido.sh
View file

@ -201,7 +201,7 @@ downloadFile() {
if (( rc == 0 )) && [ -f "$iso" ]; then if (( rc == 0 )) && [ -f "$iso" ]; then
total=$(stat -c%s "$iso") total=$(stat -c%s "$iso")
if [ "$total" -lt 100000000 ]; then if [ "$total" -lt 100000000 ]; then
error "Downloaded ISO is only $total bytes?" && return 1 error "Invalid download link: $url (is only $total bytes?). Please report this issue." && return 1
fi fi
! verifyFile "$iso" "$size" "$total" "$sum" && return 1 ! verifyFile "$iso" "$size" "$total" "$sum" && return 1
html "Download finished successfully..." && return 0 html "Download finished successfully..." && return 0