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

Add 5.2.0-rc3

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
4.2/Dockerfile generated
View File

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

2
5.0/Dockerfile generated
View File

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

2
5.1/Dockerfile generated
View File

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

9
4.1/Dockerfile → 5.2-rc/Dockerfile generated
View File

@ -20,8 +20,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 4.1.1 ENV QEMU_VERSION 5.2.0-rc3
ENV QEMU_URL https://download.qemu.org/qemu-4.1.1.tar.xz ENV QEMU_URL https://download.qemu.org/qemu-5.2.0-rc3.tar.xz
RUN set -eux; \ RUN set -eux; \
\ \
@ -61,9 +61,12 @@ RUN set -eux; \
libxen-dev \ libxen-dev \
make \ make \
pkg-config \ pkg-config \
python \ python3 \
xfslibs-dev \ xfslibs-dev \
zlib1g-dev \ zlib1g-dev \
# https://wiki.qemu.org/ChangeLog/5.2#Build_Information
ninja-build \
python3-setuptools \
; \ ; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
\ \

6
4.1/qemu-signals.patch → 5.2-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
4.1/start-qemu → 5.2-rc/start-qemu generated
View File

7
Dockerfile.template
View File

@ -55,9 +55,14 @@ RUN set -eux; \
libxen-dev \ libxen-dev \
make \ make \
pkg-config \ pkg-config \
python \ python3 \
xfslibs-dev \ xfslibs-dev \
zlib1g-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/*; \ rm -rf /var/lib/apt/lists/*; \
\ \

8
versions.json
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": { "4.2": {
"url": "https://download.qemu.org/qemu-4.2.1.tar.xz", "url": "https://download.qemu.org/qemu-4.2.1.tar.xz",
"version": "4.2.1" "version": "4.2.1"
@ -14,5 +10,9 @@
"5.1": { "5.1": {
"url": "https://download.qemu.org/qemu-5.1.0.tar.xz", "url": "https://download.qemu.org/qemu-5.1.0.tar.xz",
"version": "5.1.0" "version": "5.1.0"
},
"5.2-rc": {
"url": "https://download.qemu.org/qemu-5.2.0-rc3.tar.xz",
"version": "5.2.0-rc3"
} }
} }