[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 03/18] docker: debian/s390x no more in unstable,
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v6 03/18] docker: debian/s390x no more in unstable, now available in Stretch |
Date: |
Tue, 11 Jul 2017 00:09:45 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/docker/Makefile.include | 1 +
tests/docker/dockerfiles/debian-s390x-cross.docker | 20 ++++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 01d7af9698..1eb32eebfa 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -59,6 +59,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
docker-image-debian-armhf-cross: docker-image-debian9
docker-image-debian-arm64-cross: docker-image-debian9
docker-image-debian-mipsel-cross: docker-image-debian9
+docker-image-debian-s390x-cross: docker-image-debian9
# Expand all the pre-requistes for each docker image and test combination
$(foreach i,$(DOCKER_IMAGES), \
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker
b/tests/docker/dockerfiles/debian-s390x-cross.docker
index cfc354ce5d..18fe813aa7 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -1,27 +1,27 @@
#
# Docker s390 cross-compiler target
#
-# This docker target is based on stretch (testing) as the stable build
-# doesn't have the cross compiler available.
+# This docker target builds on the debian Stretch base image.
#
-FROM debian:testing-slim
-
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
+FROM qemu:debian9
# Add the s390x architecture
RUN dpkg --add-architecture s390x
# Grab the updated list of packages
RUN apt update && apt dist-upgrade -yy
-RUN apt install -yy build-essential clang
-RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
-RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
+ apt-get install -y --no-install-recommends \
+ binutils-multiarch \
+ gcc-multilib-s390x-linux-gnu
+
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
+ apt-get build-dep -yy -a s390x qemu
# Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu-
-RUN DEBIAN_FRONTEND=noninteractive \
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
glusterfs-common:s390x \
libbz2-dev:s390x \
--
2.13.2
- [Qemu-devel] [PATCH v6 08/18] docker: enable virgl to extend code coverage on amd64, (continued)
- [Qemu-devel] [PATCH v6 08/18] docker: enable virgl to extend code coverage on amd64, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 07/18] docker: add debian/amd64, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 13/18] shippable: add ppc64el targets, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 12/18] shippable: add armel targets, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 15/18] docker: add 'apt-fake' script which generate fake debian packages, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 17/18] shippable: add powerpc target, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 01/18] docker: rename debian stable -> 9 (Stretch), Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 03/18] docker: debian/s390x no more in unstable, now available in Stretch,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v6 06/18] docker: add debian/ppc64el based on Stretch, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 09/18] docker: enable netmap to extend code coverage on amd64, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 10/18] docker: enable gcrypt to extend code coverage on amd64, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 11/18] docker: enable nettle to extend code coverage on arm64, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 14/18] shippable: add x86_64 targets, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 16/18] docker: add qemu:debian-jessie based on outdated jessie release, Philippe Mathieu-Daudé, 2017/07/10
- [Qemu-devel] [PATCH v6 18/18] shippable: restrict builds to master/staging and shippable* branches, Philippe Mathieu-Daudé, 2017/07/10