[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 26/42] tests/docker: add debian-amd64-cross for n
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 26/42] tests/docker: add debian-amd64-cross for non-x86 hosts |
Date: |
Wed, 4 Sep 2019 21:29:57 +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>
---
tests/docker/Makefile.include | 6 +++++
.../dockerfiles/debian-amd64-cross.docker | 22 +++++++++++++++++++
2 files changed, 28 insertions(+)
create mode 100644 tests/docker/dockerfiles/debian-amd64-cross.docker
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 2c8cb790ad0..cb0961a69e4 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -87,7 +87,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] [PATCH v1 42/42] tests/docker: don't always encoding for subprocess.check_output, (continued)
- [Qemu-devel] [PATCH v1 42/42] tests/docker: don't always encoding for subprocess.check_output, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 16/42] tests/docker: move our sparc64 cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 36/42] .travis.yml: Document how the build matrix use caches, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 40/42] Fedora images: use URLs from stable "archives.fedoraproject.org", Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 38/42] .travis.yml: Cache Linux/GCC 'non-debug profile' jobs together, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 39/42] .travis.yml: Cache Linux/Clang jobs together, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 25/42] tests/docker: avoid $SHELL invoke bash directly, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 26/42] tests/docker: add debian-amd64-cross for non-x86 hosts,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 27/42] tests/docker: use --arch-only for installing deps, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 31/42] .travis.yml: Increase cache timeout from 3min to 20min, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 22/42] tests/docker: drop powerpc-user image for QEMU cross builds, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 37/42] .travis.yml: Cache Linux/GCC 'debug profile' jobs together, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 20/42] tests/docker: move our ppc64 cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 23/42] tests/docker: add debian-xtensa-cross to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/04