From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffFkG-0002Qu-Oc for qemu-devel@nongnu.org; Mon, 16 Jul 2018 22:29:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffFkF-000086-Rp for qemu-devel@nongnu.org; Mon, 16 Jul 2018 22:29:44 -0400 Received: from mail-ua0-x22b.google.com ([2607:f8b0:400c:c08::22b]:39696) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffFkF-00007s-L9 for qemu-devel@nongnu.org; Mon, 16 Jul 2018 22:29:43 -0400 Received: by mail-ua0-x22b.google.com with SMTP id g18-v6so13408322uam.6 for ; Mon, 16 Jul 2018 19:29:43 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 16 Jul 2018 23:29:23 -0300 Message-Id: <20180717022924.25428-4-f4bug@amsat.org> In-Reply-To: <20180717022924.25428-1-f4bug@amsat.org> References: <20180717022924.25428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [RFC PATCH 3/4] docker: Rename 'amd64' image as 'host-cross' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Signed-off-by: Philippe Mathieu-Daudé --- .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é -- 2.18.0