diff --git a/5.0/qemu-signals.patch b/5.0/qemu-signals.patch deleted file mode 100644 index 4b8c712..0000000 --- a/5.0/qemu-signals.patch +++ /dev/null @@ -1,20 +0,0 @@ -Origin: https://bugs.launchpad.net/qemu/+bug/1217339/comments/2 -Origin: https://lists.nongnu.org/archive/html/qemu-devel/2017-03/msg03039.html - -diff --git a/softmmu/vl.c b/softmmu/vl.c -index 1ad1c04637..9e07fe1dbb 100644 ---- a/softmmu/vl.c -+++ b/softmmu/vl.c -@@ -1898,7 +1898,11 @@ void qemu_system_killed(int signal, pid_t pid) - /* Cannot call qemu_system_shutdown_request directly because - * we are in a signal handler. - */ -- shutdown_requested = SHUTDOWN_CAUSE_HOST_SIGNAL; -+ if (signal == SIGHUP) { -+ powerdown_requested = 1; -+ } else { -+ shutdown_requested = SHUTDOWN_CAUSE_HOST_SIGNAL; -+ } - qemu_notify_event(); - } - diff --git a/5.1/Dockerfile b/5.1/Dockerfile deleted file mode 100644 index c346587..0000000 --- a/5.1/Dockerfile +++ /dev/null @@ -1,192 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bullseye-slim - -RUN set -eux; \ -# add backports for (potentially) newer QEMU firmware packages - suite="$(awk '$1 == "deb" { print $3; exit }' /etc/apt/sources.list)"; \ - echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ -# and add APT pinning to ensure we don't accidentally get QEMU from Debian - { \ - echo 'Package: src:edk2'; \ - echo 'Pin: release a=*-backports'; \ - echo 'Pin-Priority: 600'; \ - echo; \ - echo 'Package: src:qemu'; \ - echo 'Pin: version *'; \ - echo 'Pin-Priority: -10'; \ - } > /etc/apt/preferences.d/qemu.pref; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ovmf \ - ovmf-ia32 \ - qemu-efi-aarch64 \ - qemu-efi-arm \ - ; \ - rm -rf /var/lib/apt/lists/* - -COPY *.patch /qemu-patches/ - -# https://wiki.qemu.org/SecurityProcess -ENV QEMU_KEYS \ -# Michael Roth - CEACC9E15534EBABB82D3FA03353C9CEF108B584 -# https://wiki.qemu.org/Planning/ReleaseProcess#Sign_the_resulting_tarball_with_GPG: (they get signed by whoever is making the release) - -# https://www.qemu.org/download/#source -# https://download.qemu.org/?C=M;O=D -ENV QEMU_VERSION 5.1.0 -ENV QEMU_URL https://download.qemu.org/qemu-5.1.0.tar.xz - -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - gnupg dirmngr \ - wget \ - xz-utils \ - \ - patch \ - \ - bzip2 \ - gcc \ - gnutls-dev \ - libaio-dev \ - libbz2-dev \ - libc-dev \ - libcap-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libglib2.0-dev \ - libiscsi-dev \ - libjpeg-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpixman-1-dev \ - libpng-dev \ - librbd-dev \ - libseccomp-dev \ - libssh-dev \ - libusb-1.0-0-dev \ - libusbredirparser-dev \ - libxen-dev \ - make \ - pkg-config \ - python3 \ - xfslibs-dev \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - tarball="$(basename "$QEMU_URL")"; \ - wget -O "$tarball.sig" "$QEMU_URL.sig"; \ - wget -O "$tarball" "$QEMU_URL" --progress=dot:giga; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - for key in $QEMU_KEYS; do \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - done; \ - gpg --batch --verify "$tarball.sig" "$tarball"; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME"; \ - \ - mkdir /usr/src/qemu; \ - tar -xf "$tarball" -C /usr/src/qemu --strip-components=1; \ - rm "$tarball" "$tarball.sig"; \ - \ - cd /usr/src/qemu; \ - \ - for p in /qemu-patches/*.patch; do \ - patch --strip 1 --input "$p"; \ - done; \ - rm -rf /qemu-patches; \ - \ - ./configure --help; \ - ./configure \ -# let's add a link to our source code in the output of "--version" in case our users end up filing bugs against the QEMU project O:) - --with-pkgversion='https://github.com/tianon/docker-qemu' \ - --target-list=' \ -# system targets -# (https://sources.debian.org/src/qemu/buster/debian/rules/#L59-L63, slimmed) - i386-softmmu x86_64-softmmu aarch64-softmmu arm-softmmu m68k-softmmu \ - mips64-softmmu mips64el-softmmu ppc64-softmmu riscv64-softmmu \ - sparc64-softmmu s390x-softmmu \ - ' \ -# let's point "firmware path" to Debian's value so we get access to "OVMF.fd" and friends more easily - --firmwarepath=/usr/share/qemu:/usr/share/seabios:/usr/lib/ipxe/qemu \ -# https://salsa.debian.org/qemu-team/qemu/-/blob/058ab4ec8623766b50055c8c56d0d5448d52fb0a/debian/rules#L38 - --disable-docs \ - --disable-gtk --disable-vte \ - --disable-sdl \ - --enable-attr \ - --enable-bzip2 \ - --enable-cap-ng \ - --enable-curl \ - --enable-curses \ - --enable-fdt \ - --enable-gnutls \ - --enable-kvm \ - --enable-libiscsi \ - --enable-libnfs \ - --enable-libssh \ - --enable-libusb \ - --enable-linux-aio \ - --enable-modules \ - --enable-numa \ - --enable-rbd \ - --enable-seccomp \ - --enable-tools \ - --enable-usb-redir \ - --enable-vhost-net \ - --enable-vhost-user \ - --enable-vhost-vsock \ - --enable-virtfs \ - --enable-vnc \ - --enable-vnc-jpeg \ - --enable-vnc-png \ - --enable-xen \ - --enable-xfsctl \ -# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) -# --enable-vde \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - cd /; \ - rm -rf /usr/src/qemu; \ - \ - apt-mark auto '.*' > /dev/null; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local \ - -type f \ - \( -executable -o -name '*.so' \) \ -# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) - -not -name 'block-rbd.so' \ - -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ -# basic smoke test - qemu-img --version - -STOPSIGNAL SIGHUP - -EXPOSE 22 -EXPOSE 5900 - -COPY start-qemu /usr/local/bin/ -CMD ["start-qemu"] diff --git a/5.1/Dockerfile.native b/5.1/Dockerfile.native deleted file mode 100644 index a22c2bb..0000000 --- a/5.1/Dockerfile.native +++ /dev/null @@ -1,200 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:bullseye-slim - -RUN set -eux; \ -# add backports for (potentially) newer QEMU firmware packages - suite="$(awk '$1 == "deb" { print $3; exit }' /etc/apt/sources.list)"; \ - echo "deb http://deb.debian.org/debian $suite-backports main" > /etc/apt/sources.list.d/backports.list; \ -# and add APT pinning to ensure we don't accidentally get QEMU from Debian - { \ - echo 'Package: src:edk2'; \ - echo 'Pin: release a=*-backports'; \ - echo 'Pin-Priority: 600'; \ - echo; \ - echo 'Package: src:qemu'; \ - echo 'Pin: version *'; \ - echo 'Pin-Priority: -10'; \ - } > /etc/apt/preferences.d/qemu.pref; \ - apt-get update; \ - arch="$(dpkg --print-architecture)"; \ - case "$arch" in \ - amd64) apt-get install -y --no-install-recommends ovmf ;; \ - arm64) apt-get install -y --no-install-recommends qemu-efi-aarch64 ;; \ - armel | armhf) apt-get install -y --no-install-recommends qemu-efi-arm ;; \ - i386) apt-get install -y --no-install-recommends ovmf-ia32 ;; \ - *) echo >&2 "warning: architecture '$arch' unknown 😅 (is there a 'QEMU firmware' package that should be installed here? likely candidates: https://packages.debian.org/source/$suite/edk2)" ;; \ - esac; \ - rm -rf /var/lib/apt/lists/* - -COPY *.patch /qemu-patches/ - -# https://wiki.qemu.org/SecurityProcess -ENV QEMU_KEYS \ -# Michael Roth - CEACC9E15534EBABB82D3FA03353C9CEF108B584 -# https://wiki.qemu.org/Planning/ReleaseProcess#Sign_the_resulting_tarball_with_GPG: (they get signed by whoever is making the release) - -# https://www.qemu.org/download/#source -# https://download.qemu.org/?C=M;O=D -ENV QEMU_VERSION 5.1.0 -ENV QEMU_URL https://download.qemu.org/qemu-5.1.0.tar.xz - -RUN set -eux; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - gnupg dirmngr \ - wget \ - xz-utils \ - \ - patch \ - \ - bzip2 \ - gcc \ - gnutls-dev \ - libaio-dev \ - libbz2-dev \ - libc-dev \ - libcap-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libglib2.0-dev \ - libiscsi-dev \ - libjpeg-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpixman-1-dev \ - libpng-dev \ - librbd-dev \ - libseccomp-dev \ - libssh-dev \ - libusb-1.0-0-dev \ - libusbredirparser-dev \ - libxen-dev \ - make \ - pkg-config \ - python3 \ - xfslibs-dev \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - tarball="$(basename "$QEMU_URL")"; \ - wget -O "$tarball.sig" "$QEMU_URL.sig"; \ - wget -O "$tarball" "$QEMU_URL" --progress=dot:giga; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - for key in $QEMU_KEYS; do \ - gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \ - done; \ - gpg --batch --verify "$tarball.sig" "$tarball"; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME"; \ - \ - mkdir /usr/src/qemu; \ - tar -xf "$tarball" -C /usr/src/qemu --strip-components=1; \ - rm "$tarball" "$tarball.sig"; \ - \ - cd /usr/src/qemu; \ - \ - for p in /qemu-patches/*.patch; do \ - patch --strip 1 --input "$p"; \ - done; \ - rm -rf /qemu-patches; \ - \ - arch="$(dpkg --print-architecture)"; \ - case "$arch" in \ - amd64) targetList='x86_64-softmmu' ;; \ - arm64) targetList='aarch64-softmmu' ;; \ - armel | armhf) targetList='arm-softmmu' ;; \ - i386) targetList='i386-softmmu' ;; \ - mips64el) targetList='mips64el-softmmu' ;; \ - ppc64el) targetList='ppc64-softmmu' ;; \ - s390x) targetList='s390x-softmmu' ;; \ - *) echo >&2 "error: architecture '$arch' unimplemented 😅"; exit 1 ;; \ - esac; \ - \ - ./configure --help; \ - ./configure \ -# let's add a link to our source code in the output of "--version" in case our users end up filing bugs against the QEMU project O:) - --with-pkgversion='https://github.com/tianon/docker-qemu' \ - --target-list="$targetList" \ -# let's point "firmware path" to Debian's value so we get access to "OVMF.fd" and friends more easily - --firmwarepath=/usr/share/qemu:/usr/share/seabios:/usr/lib/ipxe/qemu \ -# https://salsa.debian.org/qemu-team/qemu/-/blob/058ab4ec8623766b50055c8c56d0d5448d52fb0a/debian/rules#L38 - --disable-docs \ - --disable-gtk --disable-vte \ - --disable-sdl \ - --enable-attr \ - --enable-bzip2 \ - --enable-cap-ng \ - --enable-curl \ - --enable-curses \ - --enable-fdt \ - --enable-gnutls \ - --enable-kvm \ - --enable-libiscsi \ - --enable-libnfs \ - --enable-libssh \ - --enable-libusb \ - --enable-linux-aio \ - --enable-modules \ - --enable-numa \ - --enable-rbd \ - --enable-seccomp \ - --enable-tools \ - --enable-usb-redir \ - --enable-vhost-net \ - --enable-vhost-user \ - --enable-vhost-vsock \ - --enable-virtfs \ - --enable-vnc \ - --enable-vnc-jpeg \ - --enable-vnc-png \ - --enable-xen \ - --enable-xfsctl \ -# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) -# --enable-vde \ - ; \ - make -j "$(nproc)"; \ - make install; \ - \ - cd /; \ - rm -rf /usr/src/qemu; \ - \ - apt-mark auto '.*' > /dev/null; \ - [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \ - find /usr/local \ - -type f \ - \( -executable -o -name '*.so' \) \ -# rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) - -not -name 'block-rbd.so' \ - -exec ldd '{}' ';' \ - | awk '/=>/ { print $(NF-1) }' \ - | sort -u \ - | xargs -r dpkg-query --search \ - | cut -d: -f1 \ - | sort -u \ - | xargs -r apt-mark manual \ - ; \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - \ -# basic smoke test - qemu-img --version - -STOPSIGNAL SIGHUP - -EXPOSE 22 -EXPOSE 5900 - -COPY start-qemu /usr/local/bin/ -CMD ["start-qemu"] diff --git a/5.1/start-qemu b/5.1/start-qemu deleted file mode 100755 index 908443c..0000000 --- a/5.1/start-qemu +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash -set -e - -# main available options: -# QEMU_CPU=n (cores) -# QEMU_RAM=nnn (megabytes) -# QEMU_HDA (filename) -# QEMU_HDA_SIZE (bytes, suffixes like "G" allowed) -# QEMU_CDROM (filename) -# QEMU_BOOT (-boot) -# QEMU_PORTS="xxx[ xxx ...]" (space separated port numbers) -# QEMU_NET_USER_EXTRA="net=192.168.76.0/24,dhcpstart=192.168.76.9" (extra raw args for "-net user,...") -# QEMU_NO_SSH=1 (suppress automatic port 22 forwarding) -# QEMU_NO_SERIAL=1 (suppress automatic "-serial stdio") -# QEMU_NO_VNC=1 (suppress automatic "-vnc ':0'") - -hostArch="$(uname -m)" -qemuArch="${QEMU_ARCH:-$hostArch}" -qemu="${QEMU_BIN:-qemu-system-$qemuArch}" -qemuArgs=() - -qemuPorts=() -if [ -z "${QEMU_NO_SSH:-}" ]; then - qemuPorts+=( 22 ) -fi -qemuPorts+=( ${QEMU_PORTS:-} ) - -if [ -e /dev/kvm ] && sh -c 'echo -n > /dev/kvm' &> /dev/null; then - # https://github.com/tianon/docker-qemu/issues/4 - qemuArgs+=( -enable-kvm ) -elif [ "$hostArch" = "$qemuArch" ]; then - echo >&2 - echo >&2 'warning: /dev/kvm not found' - echo >&2 ' PERFORMANCE WILL SUFFER' - echo >&2 ' (hint: docker run --device /dev/kvm ...)' - echo >&2 - sleep 3 -fi - -qemuArgs+=( -smp "${QEMU_CPU:-1}" ) -qemuArgs+=( -m "${QEMU_RAM:-512}" ) - -if [ -n "${QEMU_HDA:-}" ]; then - if [ ! -f "$QEMU_HDA" -o ! -s "$QEMU_HDA" ]; then - ( - set -x - qemu-img create -f qcow2 -o preallocation=off "$QEMU_HDA" "${QEMU_HDA_SIZE:-8G}" - ) - fi - - # http://wiki.qemu.org/download/qemu-doc.html#Invocation - qemuScsiDevice='virtio-scsi-pci' - case "$qemuArch" in - arm | riscv64) qemuScsiDevice='virtio-scsi-device' ;; - esac - - #qemuArgs+=( -hda "$QEMU_HDA" ) - #qemuArgs+=( -drive file="$QEMU_HDA",index=0,media=disk,discard=unmap ) - qemuArgs+=( - -drive file="$QEMU_HDA",index=0,media=disk,discard=unmap,detect-zeroes=unmap,if=none,id=hda - -device "$qemuScsiDevice" - -device scsi-hd,drive=hda - ) -fi - -if [ -n "${QEMU_CDROM:-}" ]; then - qemuArgs+=( -cdrom "$QEMU_CDROM" ) -fi - -if [ -n "${QEMU_BOOT:-}" ]; then - qemuArgs+=( -boot "$QEMU_BOOT" ) -fi - -netArg='user' -netArg+=",hostname=$(hostname)" -if [ -n "${QEMU_NET_USER_EXTRA:-}" ]; then - netArg+=",$QEMU_NET_USER_EXTRA" -fi -for port in "${qemuPorts[@]}"; do - netArg+=",hostfwd=tcp::$port-:$port" - netArg+=",hostfwd=udp::$port-:$port" -done - -qemuNetDevice='virtio-net-pci' -case "$qemuArch" in - arm | riscv64) qemuNetDevice='virtio-net-device' ;; -esac - -qemuArgs+=( - -netdev "$netArg,id=net" - -device "$qemuNetDevice,netdev=net" -) - -if [ -z "${QEMU_NO_SERIAL:-}" ]; then - qemuArgs+=( - -serial stdio - ) -fi - -if [ -z "${QEMU_NO_VNC:-}" ]; then - qemuArgs+=( - -vnc ':0' - ) -fi - -qemuArgs+=( "$@" ) - -set -x -exec "$qemu" "${qemuArgs[@]}" diff --git a/5.0/Dockerfile b/6.1/Dockerfile similarity index 94% rename from 5.0/Dockerfile rename to 6.1/Dockerfile index 858c6db..3a2aba2 100644 --- a/5.0/Dockerfile +++ b/6.1/Dockerfile @@ -39,8 +39,8 @@ ENV QEMU_KEYS \ # https://www.qemu.org/download/#source # https://download.qemu.org/?C=M;O=D -ENV QEMU_VERSION 5.0.1 -ENV QEMU_URL https://download.qemu.org/qemu-5.0.1.tar.xz +ENV QEMU_VERSION 6.1.0 +ENV QEMU_URL https://download.qemu.org/qemu-6.1.0.tar.xz RUN set -eux; \ \ @@ -83,6 +83,11 @@ RUN set -eux; \ python3 \ xfslibs-dev \ zlib1g-dev \ +# https://wiki.qemu.org/ChangeLog/5.2#Build_Information + ninja-build \ + python3-setuptools \ +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + libfuse3-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -156,6 +161,8 @@ RUN set -eux; \ --enable-xfsctl \ # rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) # --enable-vde \ +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + --enable-fuse \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/5.0/Dockerfile.native b/6.1/Dockerfile.native similarity index 94% rename from 5.0/Dockerfile.native rename to 6.1/Dockerfile.native index 402acbf..9af49b6 100644 --- a/5.0/Dockerfile.native +++ b/6.1/Dockerfile.native @@ -41,8 +41,8 @@ ENV QEMU_KEYS \ # https://www.qemu.org/download/#source # https://download.qemu.org/?C=M;O=D -ENV QEMU_VERSION 5.0.1 -ENV QEMU_URL https://download.qemu.org/qemu-5.0.1.tar.xz +ENV QEMU_VERSION 6.1.0 +ENV QEMU_URL https://download.qemu.org/qemu-6.1.0.tar.xz RUN set -eux; \ \ @@ -85,6 +85,11 @@ RUN set -eux; \ python3 \ xfslibs-dev \ zlib1g-dev \ +# https://wiki.qemu.org/ChangeLog/5.2#Build_Information + ninja-build \ + python3-setuptools \ +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + libfuse3-dev \ ; \ rm -rf /var/lib/apt/lists/*; \ \ @@ -164,6 +169,8 @@ RUN set -eux; \ --enable-xfsctl \ # rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) # --enable-vde \ +# https://www.qemu.org/2021/08/22/fuse-blkexport/ + --enable-fuse \ ; \ make -j "$(nproc)"; \ make install; \ diff --git a/5.1/qemu-signals.patch b/6.1/qemu-signals.patch similarity index 69% rename from 5.1/qemu-signals.patch rename to 6.1/qemu-signals.patch index 4b8c712..ab4ef1f 100644 --- a/5.1/qemu-signals.patch +++ b/6.1/qemu-signals.patch @@ -1,11 +1,11 @@ Origin: https://bugs.launchpad.net/qemu/+bug/1217339/comments/2 Origin: https://lists.nongnu.org/archive/html/qemu-devel/2017-03/msg03039.html -diff --git a/softmmu/vl.c b/softmmu/vl.c -index 1ad1c04637..9e07fe1dbb 100644 ---- a/softmmu/vl.c -+++ b/softmmu/vl.c -@@ -1898,7 +1898,11 @@ void qemu_system_killed(int signal, pid_t pid) +diff --git a/softmmu/runstate.c b/softmmu/runstate.c +index ce8977c6a2..392e4c88be 100644 +--- a/softmmu/runstate.c ++++ b/softmmu/runstate.c +@@ -613,7 +613,11 @@ void qemu_system_killed(int signal, pid_t pid) /* Cannot call qemu_system_shutdown_request directly because * we are in a signal handler. */ diff --git a/5.0/start-qemu b/6.1/start-qemu similarity index 100% rename from 5.0/start-qemu rename to 6.1/start-qemu diff --git a/Dockerfile.template b/Dockerfile.template index 8c9e9c9..08c897e 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -109,12 +109,10 @@ RUN set -eux; \ python3 \ xfslibs-dev \ zlib1g-dev \ -{{ if ["5.0", "5.1"] | index(env.version) then "" else ( -}} # https://wiki.qemu.org/ChangeLog/5.2#Build_Information ninja-build \ python3-setuptools \ -{{ ) end -}} -{{ if ["5.0", "5.1", "5.2"] | index(env.version) then "" else ( -}} +{{ if ["5.2"] | index(env.version) then "" else ( -}} # https://www.qemu.org/2021/08/22/fuse-blkexport/ libfuse3-dev \ {{ ) end -}} @@ -209,7 +207,7 @@ RUN set -eux; \ --enable-xfsctl \ # rbd support is enabled, but "librbd1" is not included since it adds ~60MB and is version-sensitive (https://github.com/tianon/docker-qemu/pull/11#issuecomment-689816553) # --enable-vde \ -{{ if ["5.0", "5.1", "5.2"] | index(env.version) then "" else ( -}} +{{ if ["5.2"] | index(env.version) then "" else ( -}} # https://www.qemu.org/2021/08/22/fuse-blkexport/ --enable-fuse \ {{ ) end -}} diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 450b061..18a0297 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,7 +2,7 @@ set -Eeuo pipefail declare -A aliases=( - [6.0]='6 latest' + [6.1]='6 latest' [5.2]='5' ) diff --git a/versions.json b/versions.json index c8e1a7e..5d5b721 100644 --- a/versions.json +++ b/versions.json @@ -1,12 +1,4 @@ { - "5.0": { - "url": "https://download.qemu.org/qemu-5.0.1.tar.xz", - "version": "5.0.1" - }, - "5.1": { - "url": "https://download.qemu.org/qemu-5.1.0.tar.xz", - "version": "5.1.0" - }, "5.2": { "url": "https://download.qemu.org/qemu-5.2.0.tar.xz", "version": "5.2.0" @@ -14,5 +6,9 @@ "6.0": { "url": "https://download.qemu.org/qemu-6.0.0.tar.xz", "version": "6.0.0" + }, + "6.1": { + "url": "https://download.qemu.org/qemu-6.1.0.tar.xz", + "version": "6.1.0" } }