Skip to content

Commit

Permalink
build: Update VirtIO drivers to v0.1.262 (#176)
Browse files Browse the repository at this point in the history
  • Loading branch information
kroese authored Aug 18, 2024
1 parent e9d7144 commit 7beb8e9
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 13 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM scratch
COPY --from=qemux/qemu-arm:2.10 / /
COPY --from=qemux/qemu-arm:2.12 / /

ARG VERSION_ARG="0.0"
ARG DEBCONF_NOWARNINGS="yes"
Expand Down Expand Up @@ -28,14 +28,14 @@ COPY --chmod=755 ./src /run/
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=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
VOLUME /storage

ENV RAM_SIZE "4G"
ENV CPU_CORES "2"
ENV DISK_SIZE "64G"
ENV VERSION "win11"
ENV RAM_SIZE="4G"
ENV CPU_CORES="2"
ENV DISK_SIZE="64G"
ENV VERSION="win11"

ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]
2 changes: 1 addition & 1 deletion src/entry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi
(( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15

terminal
( sleep 10; boot ) &
( sleep 30; boot ) &
tail -fn +0 "$QEMU_LOG" 2>/dev/null &
cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" &
wait $! || :
Expand Down
17 changes: 12 additions & 5 deletions src/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ updateXML() {

[ -z "$YRES" ] && YRES="720"
[ -z "$XRES" ] && XRES="1280"

sed -i "s/<VerticalResolution>1080<\/VerticalResolution>/<VerticalResolution>$YRES<\/VerticalResolution>/g" "$asset"
sed -i "s/<HorizontalResolution>1920<\/HorizontalResolution>/<HorizontalResolution>$XRES<\/HorizontalResolution>/g" "$asset"

Expand Down Expand Up @@ -683,7 +683,7 @@ addDriver() {
"win81x64"* ) folder="w8.1/amd64" ;;
"win10x64"* ) folder="w10/amd64" ;;
"win11x64"* ) folder="w11/amd64" ;;
"win2025"* ) folder="w11/amd64" ;;
"win2025"* ) folder="2k25/amd64" ;;
"win2022"* ) folder="2k22/amd64" ;;
"win2019"* ) folder="2k19/amd64" ;;
"win2016"* ) folder="2k16/amd64" ;;
Expand All @@ -701,9 +701,16 @@ addDriver() {

[ ! -d "$path/$driver/$folder" ] && return 0

if [[ "${id,,}" == "winvista"* ]]; then
[[ "${driver,,}" == "viorng" ]] && return 0
fi
case "${id,,}" in
"winvista"* )
[[ "${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"
mv "$path/$driver/$folder" "$dest"
Expand Down
2 changes: 1 addition & 1 deletion src/mido.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ downloadFile() {
if (( rc == 0 )) && [ -f "$iso" ]; then
total=$(stat -c%s "$iso")
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
! verifyFile "$iso" "$size" "$total" "$sum" && return 1
html "Download finished successfully..." && return 0
Expand Down

0 comments on commit 7beb8e9

Please sign in to comment.