| Message ID | 20200823111757.72002-6-thuth@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On 01/09/2020 18.25, Daniel P. Berrangé wrote: > On Sun, Aug 23, 2020 at 01:17:55PM +0200, Thomas Huth wrote: >> To compile-test the WHPX accelerator, we need to download these system >> headers first (they are unfortunately not part of any released and >> packaged MinGW toolchain yet). >> >> Idea taken from another patch by Stefan Weil. >> >> Message-Id: <20200804170055.2851-12-thuth@redhat.com> >> Signed-off-by: Thomas Huth <thuth@redhat.com> >> --- >> tests/docker/dockerfiles/debian-win64-cross.docker | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) > > >> >> diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker >> index 2fc9cfcbc6..4cc4a3f365 100644 >> --- a/tests/docker/dockerfiles/debian-win64-cross.docker >> +++ b/tests/docker/dockerfiles/debian-win64-cross.docker >> @@ -32,7 +32,14 @@ RUN apt-get update && \ >> mxe-$TARGET-w64-mingw32.shared-sdl2 \ >> mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \ >> mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \ >> - mxe-$TARGET-w64-mingw32.shared-zlib >> + mxe-$TARGET-w64-mingw32.shared-zlib \ >> + curl && \ >> + curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHvEmulation.h \ >> + "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvemulation.h?format=raw" && \ >> + curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHvPlatform.h \ >> + "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvplatform.h?format=raw" && \ >> + curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/winhvplatformdefs.h \ >> + "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvplatformdefs.h?format=raw" > > My only concern here is whether sourceforge.net URLs are reliable enough > for CI, or whether we should instead be mirroring the w64 repo on > git.qemu.org ? > > I guess this will be a short term issue until a new mingw release is made > and arrives i nthe distros, so we can try with the curl approach for > now and change if it causes problems That's my assumption, too. And since the containers are only rebuild when something changed (as far as I understood), the download should only occur quite rarely, so there is hopefully really not a big dependency here. > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Thanks! Thomas
diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker index 2fc9cfcbc6..4cc4a3f365 100644 --- a/tests/docker/dockerfiles/debian-win64-cross.docker +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -32,7 +32,14 @@ RUN apt-get update && \ mxe-$TARGET-w64-mingw32.shared-sdl2 \ mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \ mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \ - mxe-$TARGET-w64-mingw32.shared-zlib + mxe-$TARGET-w64-mingw32.shared-zlib \ + curl && \ + curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHvEmulation.h \ + "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvemulation.h?format=raw" && \ + curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/WinHvPlatform.h \ + "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvplatform.h?format=raw" && \ + curl -s -S -o /usr/lib/mxe/usr/x86_64-w64-mingw32.shared/include/winhvplatformdefs.h \ + "https://sourceforge.net/p/mingw-w64/mingw-w64/ci/master/tree/mingw-w64-headers/include/winhvplatformdefs.h?format=raw" # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32.shared-
To compile-test the WHPX accelerator, we need to download these system headers first (they are unfortunately not part of any released and packaged MinGW toolchain yet). Idea taken from another patch by Stefan Weil. Message-Id: <20200804170055.2851-12-thuth@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/docker/dockerfiles/debian-win64-cross.docker | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)