Add 5.0.0-rc4 (remove EOL 3.1)
This commit is contained in:
parent
05c780b9eb
commit
a7a2b1dc02
|
@ -14,8 +14,8 @@ ENV QEMU_KEYS \
|
|||
|
||||
# https://www.qemu.org/download/#source
|
||||
# https://download.qemu.org/?C=M;O=D
|
||||
ENV QEMU_VERSION 3.1.1.1
|
||||
ENV QEMU_URL https://download.qemu.org/qemu-3.1.1.1.tar.xz
|
||||
ENV QEMU_VERSION 5.0.0-rc4
|
||||
ENV QEMU_URL https://download.qemu.org/qemu-5.0.0-rc4.tar.xz
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
|
@ -48,7 +48,7 @@ RUN set -eux; \
|
|||
libpixman-1-dev \
|
||||
libpng-dev \
|
||||
libseccomp-dev \
|
||||
libssh2-1-dev \
|
||||
libssh-dev \
|
||||
libusb-1.0-0-dev \
|
||||
libusbredirparser-dev \
|
||||
libxen-dev \
|
||||
|
@ -111,7 +111,7 @@ RUN set -eux; \
|
|||
--enable-kvm \
|
||||
--enable-libiscsi \
|
||||
--enable-libnfs \
|
||||
--enable-libssh2 \
|
||||
--enable-libssh \
|
||||
--enable-libusb \
|
||||
--enable-linux-aio \
|
||||
--enable-linux-user \
|
|
@ -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.
|
|
@ -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/vl.c b/vl.c
|
||||
index 1ad1c04637..9e07fe1dbb 100644
|
||||
--- a/vl.c
|
||||
+++ b/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();
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@ for version in "${versions[@]}"; do
|
|||
-e 's/%%QEMU_VERSION%%/'"$fullVersion"'/g' \
|
||||
-e 's!%%QEMU_URL%%!'"$url"'!g' \
|
||||
Dockerfile.template > "$version/Dockerfile"
|
||||
cp -a start-qemu *.patch "$version/"
|
||||
cp -a start-qemu "$version/"
|
||||
|
||||
case "$rcVersion" in
|
||||
# https://github.com/qemu/qemu/commit/b10d49d7619e4957b4b971f816661b57e5061d71
|
||||
|
|
Loading…
Reference in New Issue
Block a user