From patchwork Mon Jul 17 14:48:30 2017 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: 107973 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp4658998obm; Mon, 17 Jul 2017 07:51:36 -0700 (PDT) X-Received: by 10.237.46.166 with SMTP id k35mr28853717qtd.21.1500303096842; Mon, 17 Jul 2017 07:51:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500303096; cv=none; d=google.com; s=arc-20160816; b=tyjnJwSP81tZI9UMnnT1SR1kVop38P2mAd2jm2KN8qfZUnIM5HIdNLSU0MUs9c677k CoOQUwDwu7/UUu1sl7YjCzIMAqggkpU+14RIEfs7eX41IE7wCkSTjbGL+cglsM/6XoWV ViVTPo4AJaPztWXQFYDX5QK8d7W8u+2/tSWz38tNTFimn5M/aJGeoORdbTQO0U+UORkn jC+LIZnJiZmMSJW8K2GvoxBqx50UTBCC+B7E8oAmvrXemTp5SZCbQDERZV3JSUTb9cY7 cYmY+CY8gRcIwj/9W635tyRg9UP3NunA8c9xm3vjuakTM2sbBTmbZjJRmMD8HWkt+TJb b3Dw== 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:arc-authentication-results; bh=MuqnV27AEic9tWTnDVngPnqyQB3TTuZwJiKRCGpbd5k=; b=Wp1wmkVakpXVeCDl//ip1dF6ldiZ816eX4aocET8ip172HZX9xDm09w21Jt7c5VJmj rKlICq1ECHnrsXFEo45giTAgiG3j3SAA9WFH38TXZaC2KemHywKPOfLO8yYU1zdJJscJ 3AvZn7fZJgIvGbFh0PUldsbxX+WWnUGuYYIqKpyoZsAFjAjZjTF8iPpydzXE7in4YXCR NkRpLXBYt91m2KMbgDYfPm43Wd3L7uPs65OMrSzexvjtXaHuQ9Tpya7leBnr6xBYadeG w+DDH4MEPZoei+HOEQJo7e3szsJyQsq7DSKFyF7oxwQLON0aS/eA1067oTAj05JS3f9o ELOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=iQM2lksf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h45si15442062qtc.50.2017.07.17.07.51.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 17 Jul 2017 07:51:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.b=iQM2lksf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:50848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX7N0-0007xX-0a for patch@linaro.org; Mon, 17 Jul 2017 10:51:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX7KW-0005wJ-AA for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:49:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX7KV-00028j-5U for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:49:00 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:36038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX7KU-00027m-Sb for qemu-devel@nongnu.org; Mon, 17 Jul 2017 10:48:59 -0400 Received: by mail-wr0-x231.google.com with SMTP id y43so2188210wrd.3 for ; Mon, 17 Jul 2017 07:48:58 -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=MuqnV27AEic9tWTnDVngPnqyQB3TTuZwJiKRCGpbd5k=; b=iQM2lksf33Vkoosr3dmdsQvdvuyA5XlVUYKWIBlWRBcojPA1KlTYlvrQbCQKT5HJ/p kNNYmbqRTxbgf109GmoKw9o9miaQY+we6XJDtO/vSCiAD+NshQAeR2DCrjxn2lxrEfEa j/TgnjgucVhgIsmovVd1nROYNK27gVD8Aw/fk= 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=MuqnV27AEic9tWTnDVngPnqyQB3TTuZwJiKRCGpbd5k=; b=QPGlbBOA34R/yemcN1sZUMKAgQXPwzOZYt2aArh+QdFZCrJ8NWIhx2idlWjw91oTKG FoBURtMxtSzvRBkwphGQg3wvzvxLCUYb7oNC0ZpoXS3qVD04TLYaMR/6akxG+avh4fat NhqzPnKPwJXlsIUQ8saljj2DgVATHKgUMV+jXZgTkXgDn9svrWZNqhgMz0hQv926p1NL 3zidHVBxSXkOYgGhqEnB4gEab5xBahFS5MfmiB0+5xDSYcn6NYpsOxp5qEt1UtrCf99t oc/8Axw4DC931vP97ZE9IrJErHFj6UNXM1DcozjZzI3sGv/caWQeT218H8AgoESuD/Uv jdKQ== X-Gm-Message-State: AIVw112kuxSIyVbv/niDqS1ThZWdLQ2QckMaoaCDbtI+dJvdYdu26jja EC3UNyUgam4xJb79 X-Received: by 10.223.138.232 with SMTP id z37mr2099960wrz.66.1500302937632; Mon, 17 Jul 2017 07:48:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 1sm10601415wmn.32.2017.07.17.07.48.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 07:48:54 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B1F173E034F; Mon, 17 Jul 2017 15:48:48 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 17 Jul 2017 15:48:30 +0100 Message-Id: <20170717144848.11793-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170717144848.11793-1-alex.bennee@linaro.org> References: <20170717144848.11793-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:400c:c0c::231 Subject: [Qemu-devel] [PATCH v1 05/23] docker: rename debian stable -> 9 (Stretch) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 6 +++--- tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ++-- tests/docker/dockerfiles/{debian.docker => debian9.docker} | 13 +++++++++---- 5 files changed, 18 insertions(+), 13 deletions(-) rename tests/docker/dockerfiles/{debian.docker => debian9.docker} (62%) -- 2.13.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 012a2fc1af..72bb52ad7b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -56,9 +56,9 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker "BUILD","$*") # Enforce dependancies for composite images -docker-image-debian-armhf-cross: docker-image-debian -docker-image-debian-arm64-cross: docker-image-debian -docker-image-debian-mipsel-cross: docker-image-debian +docker-image-debian-armhf-cross: docker-image-debian9 +docker-image-debian-arm64-cross: docker-image-debian9 +docker-image-debian-mipsel-cross: docker-image-debian9 # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES), \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 45b891d57a..f1bfa64160 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 base debian image. +# This docker target builds on the debian Stretch base image. # -FROM qemu:debian +FROM qemu:debian9 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture arm64 diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index e67dfdccc5..2beacef49b 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -1,9 +1,9 @@ # # Docker armhf cross-compiler target # -# This docker target builds on the base debian image. +# This docker target builds on the debian Stretch base image. # -FROM qemu:debian +FROM qemu:debian9 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture armhf diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 2156bdb28d..9ee997aa54 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -1,9 +1,9 @@ # # Docker mipsel cross-compiler target # -# This docker target builds on the base debian image. +# This docker target builds on the debian Stretch base image. # -FROM qemu:debian +FROM qemu:debian9 MAINTAINER Philippe Mathieu-Daudé # Add the foreign architecture we want and install dependencies diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian9.docker similarity index 62% rename from tests/docker/dockerfiles/debian.docker rename to tests/docker/dockerfiles/debian9.docker index 10953b2425..c74f71283c 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian9.docker @@ -1,13 +1,13 @@ # # Docker multiarch cross-compiler target # -# This docker target is builds on Debian and Emdebian's cross compiler targets -# to build distro with a selection of cross compilers for building test binaries. +# This docker target is builds on Debian cross compiler targets to build distro +# with a selection of cross compilers for building test binaries. # # On its own you can't build much but the docker-foo-cross targets # build on top of the base debian image. # -FROM debian:stable-slim +FROM debian:stretch-slim # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list @@ -17,4 +17,9 @@ RUN apt update RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ - ca-certificates build-essential clang git bison flex + bison \ + build-essential \ + ca-certificates \ + clang \ + flex \ + git