Add 5.2.0-rc3

This commit is contained in:
Tianon Gravi 2020-11-30 11:03:55 -08:00
parent 4125f4fa3d
commit de840b8932
8 changed files with 22 additions and 14 deletions

2
4.2/Dockerfile generated
View File

@ -61,7 +61,7 @@ RUN set -eux; \
libxen-dev \
make \
pkg-config \
python \
python3 \
xfslibs-dev \
zlib1g-dev \
; \

2
5.0/Dockerfile generated
View File

@ -61,7 +61,7 @@ RUN set -eux; \
libxen-dev \
make \
pkg-config \
python \
python3 \
xfslibs-dev \
zlib1g-dev \
; \

2
5.1/Dockerfile generated
View File

@ -61,7 +61,7 @@ RUN set -eux; \
libxen-dev \
make \
pkg-config \
python \
python3 \
xfslibs-dev \
zlib1g-dev \
; \

View File

@ -20,8 +20,8 @@ ENV QEMU_KEYS \
# https://www.qemu.org/download/#source
# https://download.qemu.org/?C=M;O=D
ENV QEMU_VERSION 4.1.1
ENV QEMU_URL https://download.qemu.org/qemu-4.1.1.tar.xz
ENV QEMU_VERSION 5.2.0-rc3
ENV QEMU_URL https://download.qemu.org/qemu-5.2.0-rc3.tar.xz
RUN set -eux; \
\
@ -61,9 +61,12 @@ RUN set -eux; \
libxen-dev \
make \
pkg-config \
python \
python3 \
xfslibs-dev \
zlib1g-dev \
# https://wiki.qemu.org/ChangeLog/5.2#Build_Information
ninja-build \
python3-setuptools \
; \
rm -rf /var/lib/apt/lists/*; \
\

View File

@ -1,10 +1,10 @@
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/vl.c b/vl.c
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 1ad1c04637..9e07fe1dbb 100644
--- a/vl.c
+++ b/vl.c
--- 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.

View File

View File

@ -55,9 +55,14 @@ RUN set -eux; \
libxen-dev \
make \
pkg-config \
python \
python3 \
xfslibs-dev \
zlib1g-dev \
{{ if ["4.2", "5.0", "5.1"] | index(env.version) then "" else ( -}}
# https://wiki.qemu.org/ChangeLog/5.2#Build_Information
ninja-build \
python3-setuptools \
{{ ) end -}}
; \
rm -rf /var/lib/apt/lists/*; \
\

View File

@ -1,8 +1,4 @@
{
"4.1": {
"url": "https://download.qemu.org/qemu-4.1.1.tar.xz",
"version": "4.1.1"
},
"4.2": {
"url": "https://download.qemu.org/qemu-4.2.1.tar.xz",
"version": "4.2.1"
@ -14,5 +10,9 @@
"5.1": {
"url": "https://download.qemu.org/qemu-5.1.0.tar.xz",
"version": "5.1.0"
},
"5.2-rc": {
"url": "https://download.qemu.org/qemu-5.2.0-rc3.tar.xz",
"version": "5.2.0-rc3"
}
}