gnh1201/docker-qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 5.0.0-rc4 (remove EOL 3.1)

Browse Source
This commit is contained in:
Tianon Gravi 2020-04-27 12:38:05 -07:00
parent 05c780b9eb
commit a7a2b1dc02
5 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3.1/Dockerfile → 5.0-rc/Dockerfile
View File

@ -14,8 +14,8 @@ ENV QEMU_KEYS \
# https://www.qemu.org/download/#source # https://www.qemu.org/download/#source
# https://download.qemu.org/?C=M;O=D # https://download.qemu.org/?C=M;O=D
ENV QEMU_VERSION 3.1.1.1 ENV QEMU_VERSION 5.0.0-rc4
ENV QEMU_URL https://download.qemu.org/qemu-3.1.1.1.tar.xz ENV QEMU_URL https://download.qemu.org/qemu-5.0.0-rc4.tar.xz
RUN set -eux; \ RUN set -eux; \
\ \
@ -48,7 +48,7 @@ RUN set -eux; \
libpixman-1-dev \ libpixman-1-dev \
libpng-dev \ libpng-dev \
libseccomp-dev \ libseccomp-dev \
libssh2-1-dev \ libssh-dev \
libusb-1.0-0-dev \ libusb-1.0-0-dev \
libusbredirparser-dev \ libusbredirparser-dev \
libxen-dev \ libxen-dev \
@ -111,7 +111,7 @@ RUN set -eux; \
--enable-kvm \ --enable-kvm \
--enable-libiscsi \ --enable-libiscsi \
--enable-libnfs \ --enable-libnfs \
--enable-libssh2 \ --enable-libssh \
--enable-libusb \ --enable-libusb \
--enable-linux-aio \ --enable-linux-aio \
--enable-linux-user \ --enable-linux-user \

6
3.1/qemu-signals.patch → 5.0-rc/qemu-signals.patch
View File

@ -1,10 +1,10 @@
Origin: https://bugs.launchpad.net/qemu/+bug/1217339/comments/2 Origin: https://bugs.launchpad.net/qemu/+bug/1217339/comments/2
Origin: https://lists.nongnu.org/archive/html/qemu-devel/2017-03/msg03039.html 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 index 1ad1c04637..9e07fe1dbb 100644
--- a/vl.c --- a/softmmu/vl.c
+++ b/vl.c +++ b/softmmu/vl.c
@@ -1898,7 +1898,11 @@ void qemu_system_killed(int signal, pid_t pid) @@ -1898,7 +1898,11 @@ void qemu_system_killed(int signal, pid_t pid)
/* Cannot call qemu_system_shutdown_request directly because /* Cannot call qemu_system_shutdown_request directly because
* we are in a signal handler. * we are in a signal handler.

0
3.1/start-qemu → 5.0-rc/start-qemu
View File

20
qemu-signals.patch
View File

@ -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();
}

2
update.sh
View File

@ -34,7 +34,7 @@ for version in "${versions[@]}"; do
-e 's/%%QEMU_VERSION%%/'"$fullVersion"'/g' \ -e 's/%%QEMU_VERSION%%/'"$fullVersion"'/g' \
-e 's!%%QEMU_URL%%!'"$url"'!g' \ -e 's!%%QEMU_URL%%!'"$url"'!g' \
Dockerfile.template > "$version/Dockerfile" Dockerfile.template > "$version/Dockerfile"
cp -a start-qemu *.patch "$version/" cp -a start-qemu "$version/"
case "$rcVersion" in case "$rcVersion" in
# https://github.com/qemu/qemu/commit/b10d49d7619e4957b4b971f816661b57e5061d71 # https://github.com/qemu/qemu/commit/b10d49d7619e4957b4b971f816661b57e5061d71