[Qemu-devel] [RFC PATCH 3/4] docker: Rename 'amd64' image as 'host-cross'

[Philippe Mathieu-Daudé]

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
 .shippable.yml                                           | 4 ++--
 tests/docker/Makefile.include                            | 2 +-
 .../{debian-amd64.docker => debian-host-cross.docker}    | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename tests/docker/dockerfiles/{debian-amd64.docker => 
debian-host-cross.docker} (82%)

diff --git a/.shippable.yml b/.shippable.yml
index f74a3de3ff..7625ba8f27 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -5,8 +5,8 @@ env:
   global:
     - LC_ALL=C
   matrix:
-    - IMAGE=debian-amd64
-      TARGET_LIST=x86_64-softmmu,x86_64-linux-user
+    - IMAGE=debian-host-cross
+      TARGET_LIST=aarch64-softmmu,x86_64-softmmu,x86_64-linux-user
     - IMAGE=debian-win32-cross
       TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu
     - IMAGE=debian-win64-cross
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index b2a7e761cc..2db4190b4c 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -83,7 +83,7 @@ endif
 # Enforce dependencies for composite images
 docker-image-debian: docker-image-debian9
 docker-image-debian8-mxe: docker-image-debian8
-docker-image-debian-amd64: docker-image-debian9
+docker-image-debian-host-cross: docker-image-debian9
 docker-image-debian-armel-cross: docker-image-debian9
 docker-image-debian-armhf-cross: docker-image-debian9
 docker-image-debian-arm64-cross: docker-image-debian9
diff --git a/tests/docker/dockerfiles/debian-amd64.docker 
b/tests/docker/dockerfiles/debian-host-cross.docker
similarity index 82%
rename from tests/docker/dockerfiles/debian-amd64.docker
rename to tests/docker/dockerfiles/debian-host-cross.docker
index d79a599a0d..17d937efc9 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-host-cross.docker
@@ -1,8 +1,11 @@
 #
-# Docker x86_64 target
+# Docker 'host' target (same architecture than the host)
 #
-# This docker target builds on the debian Stretch base image. Further
-# libraries which are not widely available are installed by hand.
+# This docker target builds on the debian Stretch base image.
+#
+# It is intented to build the host architecture, with as much
+# features as possible (libraries which are not widely available
+# are installed by hand).
 #
 FROM qemu:debian9
 MAINTAINER Philippe Mathieu-Daudé <address@hidden>
-- 
2.18.0