From patchwork Wed Sep 4 20:29:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173035 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp422003ilq; Wed, 4 Sep 2019 13:47:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8hRP44DDKt/SpSipe5/MZhPmfR0zTAB3aYP3z9OXvqMN/Yt8Fg43/L4hIihYR5ZOpBVqr X-Received: by 2002:a50:f30c:: with SMTP id p12mr165651edm.299.1567630072453; Wed, 04 Sep 2019 13:47:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567630072; cv=none; d=google.com; s=arc-20160816; b=bcPXFavqQanx/so1PEEltBWOf8e29nt/AFlkuG5F4IIdMbG+IIdhifGhSlGK4JNjc2 DUOdxlwk2sa3g/rMsuT4IBSFyEBkndFCdFCM6nDOQ90xiGSfWTtmEjretWbckCGtM1l1 EFEjhjvBc0a0frVxSHB2ygIv0jx1ClhESB5meglO+Stk4GWx4YdsoOKtoeIE4UTIMX6f kzTYB8ISnRPn3qeJzKDbX8ha1JPjNg9EJuACFA3fx6lVG7d2cDl6jP6eNZ1iNmc/twya SJkfUMrK/OiJnZQ1Dd1pVkEux56FRe7d7YsjgzzEPTZKUU1GOJ5cxjmxNt+dAbamWPUW g51A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=9p8BAxT30zLuPs+PTsow4wewanfEgFRokJTEPp+OXPU=; b=OmAMDGUZZIEYuBDeIjfuuC20tNIMcVnZlmnVoAhSov9G3PR/VJGbQ1jXqHY39uXvc1 FQ89QpYrXHzKSaPR8Q0z6DorLeOl7sFhL2Fs4qjtNyKRxXn2rooEC6qav/+EILKHKlHK P59ilmWkXR+tjlrS/mmeGFegSywZxu4SFHZcHnMRmyCEAkUDaIZ39fDzKDFAmPm9XoXv sh0WymssNzAITOCgK03zB0SiA37nTlKetiq9rZ76HIuJpxkJzLt5tdT6dbgREaLAtW+h N15cNCP10Mu3BKwlutY+eCtPq5l6hb6IBd8ZX46w3Xnf4olVRiisWoSR8Zjf+kBhk5jJ v7SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="RoOlX5/t"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t56si7114905edb.302.2019.09.04.13.47.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:47:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="RoOlX5/t"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5cBy-000842-Dv for patch@linaro.org; Wed, 04 Sep 2019 16:47:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49824) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bvJ-0008Bu-N4 for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv9-0006e3-EV for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:31 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv7-0006bL-Hz for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:26 -0400 Received: by mail-wr1-x444.google.com with SMTP id u16so217929wrr.0 for ; Wed, 04 Sep 2019 13:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9p8BAxT30zLuPs+PTsow4wewanfEgFRokJTEPp+OXPU=; b=RoOlX5/tEuce1rgHi/eF2JXXwzwfTUntqM+MZSbyyyZj5UQTRwPSmQ7ciwraxRycax C9Sug2K1OynTgpaSzTWsNvmCC/Ph7IE9Gy2a7ugms/6AmfpiEQ8JtYGbNWLtmwNO0eiD Zm+DuI6FZIlVdNFGcqzfQOmgI2ojW/TZqYU87+WN18zL4M3b4idOuhvoKfQLVj8Ceq2T eOLnRno0gj0xROVreUEzpWnQ9Rf/ehxnbrfLej6k3eNAgKGuyACnZpDXVC5WZcjqJAgo l0r1kx4VsJIg6G9jdAxbV6Ne6AXQE+7LtZAdCXdO/BxmKBiYD/1J81/VWNwG1NqiI9K6 aUkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9p8BAxT30zLuPs+PTsow4wewanfEgFRokJTEPp+OXPU=; b=tFa0j5vW6VXhjPlQHr7F5/J2PImj4ahHUPZuokIU7xFZgRbl8WhIljy/dRpbVl7ADj P5pjWYiHMB9AmfQQypTYocqEev+SBrp4ma8N6Fi1zaE9n0E8h9PMkwTVKOwFP0eK3vTl YZsij4PZmcSga2gd0iYIHPC7Q81XvbBw7blMcTtuA3e0ykNVnirCW28MxrpsUR3LBwHH /IWqy7aUzh7YYTSHMvYmWJl4JITnqnuY/Ej49D0hT8QUS4YntImdXn08mwnksHMB2mos XjlxTq4BebGOawyrUBwLO0ld42IHJqrsfUBhD/shADlPIYpClZpv6LpU9qSI0HbnDxZ5 qR8Q== X-Gm-Message-State: APjAAAWTKHCespDZRdDZO+bG35LXqptdV7tmvF/J/XaUWTAFfFtUPwz2 IZ1lgmoDqtqtfcz2u9GddaBkrg== X-Received: by 2002:a5d:4f08:: with SMTP id c8mr24089975wru.51.1567629024275; Wed, 04 Sep 2019 13:30:24 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q192sm196901wme.23.2019.09.04.13.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7E2DC1FF9B; Wed, 4 Sep 2019 21:30:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:42 +0100 Message-Id: <20190904203013.9028-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v1 11/42] tests/docker: move our arm64 cross compile to Buster X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can unify our cross build images for both QEMU and tests. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 5 ++--- .../docker/dockerfiles/debian-arm64-cross.docker | 4 ++-- .../dockerfiles/debian-buster-arm64-cross.docker | 16 ---------------- tests/tcg/configure.sh | 2 +- 4 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-buster-arm64-cross.docker -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 89881fb5f5d..48c22ae40c0 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -86,13 +86,10 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker endif # Enforce dependencies for composite images -docker-image-debian: docker-image-debian9 docker-image-debian9-mxe: docker-image-debian9 docker-image-debian-amd64: 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 -docker-image-debian-buster-arm64-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian9 docker-image-debian-mipsel-cross: docker-image-debian9 docker-image-debian-mips64el-cross: docker-image-debian9 @@ -101,6 +98,8 @@ docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe +docker-image-debian-arm64-cross: docker-image-debian10 + docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid docker-image-debian-m68k-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 6b59ef0843a..55045ff5d5a 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -1,9 +1,9 @@ # # Docker arm64 cross-compiler target # -# This docker target builds on the debian Stretch base image. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian9 +FROM qemu:debian10 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture arm64 diff --git a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker b/tests/docker/dockerfiles/debian-buster-arm64-cross.docker deleted file mode 100644 index 52787edcc2c..00000000000 --- a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker +++ /dev/null @@ -1,16 +0,0 @@ -# -# Docker arm64 cross-compiler target -# -# This docker target builds on the Debian's Buster base image. There -# are no QEMU pre-requistes so this image can only be used to build -# test cases. -# -FROM qemu:debian10 - -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture arm64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - crossbuild-essential-arm64 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 5f794b664b8..2a351a00048 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -95,7 +95,7 @@ for target in $target_list; do case $target in aarch64-*) # We don't have any bigendian build tools so we only use this for AArch64 - container_image=debian-buster-arm64-cross + container_image=debian-arm64-cross container_cross_cc=aarch64-linux-gnu-gcc ;; alpha-*)