[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 29/45] tests/docker: add debian-amd64-cross for non-x
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 29/45] tests/docker: add debian-amd64-cross for non-x86 hosts |
Date: |
Tue, 10 Sep 2019 09:43:33 +0100 |
When building on a non-x86 host we need to setup the x86 build like
any other cross compiler.
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/.shippable.yml b/.shippable.yml
index f74a3de3ffd..bbc6f88510f 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -27,6 +27,8 @@ env:
TARGET_LIST=ppc64-softmmu,ppc64-linux-user,ppc64abi32-linux-user
build:
pre_ci:
+ # usually host ARCH is set by configure
+ - echo "ARCH=$(uname -m)" > config-host.mak
- make docker-image-${IMAGE} V=1
pre_ci_boot:
image_name: qemu
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 27a1cc0d833..7df8dbe1a17 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -89,7 +89,13 @@ endif
# Enforce dependencies for composite images
docker-image-debian9-mxe: docker-image-debian9
+ifeq ($(ARCH),x86_64)
docker-image-debian-amd64: docker-image-debian9
+DOCKER_PARTIAL_IMAGES += debian-amd64-cross
+else
+docker-image-debian-amd64-cross: docker-image-debian10
+DOCKER_PARTIAL_IMAGES += debian-amd64
+endif
docker-image-debian-armel-cross: docker-image-debian9
docker-image-debian-armhf-cross: docker-image-debian9
docker-image-debian-mips-cross: docker-image-debian9
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker
b/tests/docker/dockerfiles/debian-amd64-cross.docker
new file mode 100644
index 00000000000..5d890419251
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -0,0 +1,22 @@
+#
+# Docker x86_64 cross target
+#
+# This docker target is used on non-x86_64 machines which need the
+# x86_64 cross compilers installed.
+#
+FROM qemu:debian10
+MAINTAINER Alex Bennée <address@hidden>
+
+# Add the foreign architecture we want and install dependencies
+RUN dpkg --add-architecture amd64
+RUN apt update && \
+ DEBIAN_FRONTEND=noninteractive eatmydata \
+ apt install -y --no-install-recommends \
+ crossbuild-essential-amd64
+RUN apt update && \
+ DEBIAN_FRONTEND=noninteractive eatmydata \
+ apt build-dep -yy -a amd64 --arch-only qemu
+
+# Specify the cross prefix for this image (see tests/docker/common.rc)
+ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-linux-gnu-
+ENV DEF_TARGET_LIST
x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user
--
2.20.1
- [Qemu-devel] [PULL 26/45] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES, (continued)
- [Qemu-devel] [PULL 26/45] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 30/45] tests/docker: use --arch-only for installing deps, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 27/45] tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 37/45] .travis.yml: Cache Avocado cache, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 34/45] .travis.yml: Enable multiple caching features, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 23/45] tests/docker: move our ppc64 cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 12/45] tests/docker: set DEF_TARGET_LIST for some containers, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 45/45] travis.yml: Install libcap-dev for testing virito-9p, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 33/45] configure: check if --no-pie is supported first, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 11/45] tests/docker: move DEF_TARGET_LIST setting to common.rc, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 29/45] tests/docker: add debian-amd64-cross for non-x86 hosts,
Alex Bennée <=
- [Qemu-devel] [PULL 24/45] tests/docker: update Debian Sid image, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 36/45] .travis.yml: Cache Python PIP packages, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 25/45] tests/docker: pin powerpc-user-cross to a snapshot, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 35/45] .travis.yml: Increase cache timeout from 3min to 20min, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 39/45] .travis.yml: Enable ccache on OSX, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 17/45] tests/docker: move our HPPA cross compile to Buster, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 43/45] .travis.yml: Cache Linux/Clang jobs together, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 40/45] .travis.yml: Document how the build matrix use caches, Alex Bennée, 2019/09/10
- [Qemu-devel] [PULL 31/45] tests/docker: add more images to PARTIAL_IMAGES when not on x86_64, Alex Bennée, 2019/09/10