aboutsummaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2017-02-27 14:30:27 +0000
committerFam Zheng <famz@redhat.com>2017-02-28 20:31:01 +0800
commit267004d991ca7bb8e1a98accb3b764c0622cc6e9 (patch)
tree1e7fb8f0a1e930310e99ee58eb5837a7286e485a /tests/docker
parent6181478f6395cdd9d6ffd99623d0c9f39ea53606 (diff)
downloadqemu-267004d991ca7bb8e1a98accb3b764c0622cc6e9.zip
qemu-267004d991ca7bb8e1a98accb3b764c0622cc6e9.tar.gz
qemu-267004d991ca7bb8e1a98accb3b764c0622cc6e9.tar.bz2
new: dockerfiles/debian-s390-cross
This adds an s390 cross build target to our library of docker setups. There is an issue with the xfslibs-dev:s390x package having a clash so we do a || apt-get -f install to fixup the rest of the dependencies. This doesn't build on the debian.docker file as we are using the multilib compiler which is only available in stretch (the current testing repo). Signed-off-by: Alex Bennée <alex.bennee@linaro.org> CC: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <20170227143028.16428-2-alex.bennee@linaro.org> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker')
-rw-r--r--tests/docker/dockerfiles/debian-s390x-cross.docker22
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
new file mode 100644
index 0000000..bbb21ed
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -0,0 +1,22 @@
+#
+# Docker s390 cross-compiler target
+#
+# This docker target is based on stretch (testing) as the stable build
+# doesn't have the cross compiler available.
+#
+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
+
+# Add the s390x architecture
+RUN dpkg --add-architecture s390x
+
+# Grab the updated list of packages
+RUN apt update
+RUN apt dist-upgrade -yy
+RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
+RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
+
+# Specify the cross prefix for this image (see tests/docker/common.rc)
+ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu-