riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tests/dockerfiles: update the win cross builds to stretch 

While fixing up pkg.mxe.cc they move the URLs around a bit and dropped
Jessie support in favour of Stretch. We also need to update the keys
used to verify the packages.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
remotes/github/stable-4.1
Alex Bennée 7 years ago
parent
601b5575e2
commit
67bd36beda
4 changed files with 14 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      tests/docker/Makefile.include
  2. 4
      tests/docker/dockerfiles/debian-win32-cross.docker
  3. 4
      tests/docker/dockerfiles/debian-win64-cross.docker
  4. 11
      tests/docker/dockerfiles/debian9-mxe.docker

6
tests/docker/Makefile.include
View File

@ -85,7 +85,7 @@ endif
# Enforce dependencies for composite images
docker-image-debian: docker-image-debian9
docker-image-debian8-mxe: docker-image-debian8
docker-image-debian9-mxe: docker-image-debian9
docker-image-debian-amd64: docker-image-debian9
docker-image-debian-armel-cross: docker-image-debian9
docker-image-debian-armhf-cross: docker-image-debian9
@ -96,8 +96,8 @@ docker-image-debian-mipsel-cross: docker-image-debian9
docker-image-debian-mips64el-cross: docker-image-debian9
docker-image-debian-ppc64el-cross: docker-image-debian9
docker-image-debian-s390x-cross: docker-image-debian9
docker-image-debian-win32-cross: docker-image-debian8-mxe
docker-image-debian-win64-cross: docker-image-debian8-mxe
docker-image-debian-win32-cross: docker-image-debian9-mxe
docker-image-debian-win64-cross: docker-image-debian9-mxe
docker-image-debian-alpha-cross: docker-image-debian-sid
docker-image-debian-hppa-cross: docker-image-debian-sid

4
tests/docker/dockerfiles/debian-win32-cross.docker
View File

@ -1,9 +1,9 @@
#
# Docker mingw32 cross-compiler target
#
# This docker target builds on the debian Jessie MXE base image.
# This docker target builds on the debian Stretch MXE base image.
#
FROM qemu:debian8-mxe
FROM qemu:debian9-mxe
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

4
tests/docker/dockerfiles/debian-win64-cross.docker
View File

@ -1,9 +1,9 @@
#
# Docker mingw64 cross-compiler target
#
# This docker target builds on the debian Jessie MXE base image.
# This docker target builds on the debian Stretch MXE base image.
#
FROM qemu:debian8-mxe
FROM qemu:debian9-mxe
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>

11
tests/docker/dockerfiles/debian8-mxe.docker → tests/docker/dockerfiles/debian9-mxe.docker
View File

@ -1,15 +1,18 @@
#
# Docker mingw cross-compiler target
#
# This docker target builds on the debian Jessie base image.
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian8
FROM qemu:debian9
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends gnupg dirmngr
# Add the foreign architecture we want and install dependencies
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB && \
echo "deb http://pkg.mxe.cc/repos/apt/debian jessie main" > /etc/apt/sources.list.d/mxeapt.list
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A276 && \
echo "deb http://pkg.mxe.cc/repos/apt stretch main" > /etc/apt/sources.list.d/mxeapt.list
RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
Write Preview
Loading…
Cancel
Save