From patchwork Tue Jul 18 10:44:46 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: 108086 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp5734267obm; Tue, 18 Jul 2017 03:53:50 -0700 (PDT) X-Received: by 10.200.36.6 with SMTP id c6mr1226588qtc.124.1500375229987; Tue, 18 Jul 2017 03:53:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500375229; cv=none; d=google.com; s=arc-20160816; b=CJ1wc/praIXzn7jReshbaNJe6sqRq5gLSKWwYOocmCZSDqG/086h7tO3txUnCubHEo 3RaxMuVNm0O0PHKdCFz1l2y6Bz7pINociMSiaCH18ZXwUaHqqXmvFIj+xJjI3rhdbTeh A2IlNNL8wIwFR0Ss28hl0TCgKHUoY8Jo5w3arDdo0fw68Db27oJxM8QPsF4ibs03vy+r Uk4oMz0KvWgcqyvSZzCW9qmSllCtprj9KcSJsf5KLW0HnXoqGX9CqUGDsc5DP2JehHF+ e2INK1g97a4uMm+sjrW84TvFHaaLx6+nmaN6y/ot/SR5XCr/sBxs/iAXJcWAML6Veo9h x3Hw== 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=gyCUs83XjByHyXu/WryglKBVMkEASitH/De+QUig/io=; b=cOKfxlCmABY3ZCq6witd4vl1CASXrqLyBXfZyTYasQ31RucCQUl/r5jmoHChBZoZgB 7TcWmOH7MalCFEWJmHwZV8zx2gWfgnDDiOZEJmLZwVpdckWkNlf/sxYMx8Wiwnm20AaF 2KAUQDOvOJI9QVSasE34hEgQDdV9o+0vkbfRx3vz9fB/qw7tRliULxJt+UvIr7MriEc4 LazlFyixI1Mn5gsSSDD1xDGCyUXpQrfhLw4CpvQ3HvaTam5McKcSklRv2OrxwFW6IlOx uswhWUronZOojr/qzSXpYFGzlTRwUes56Zig2VDuHM+FzzReaKYVqfVtbKg59eFktOFy 18oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=fy3KnJAa; 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 m64si1760859qki.323.2017.07.18.03.53.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 18 Jul 2017 03:53:49 -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=fy3KnJAa; 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]:55401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXQ8R-0005yN-Fz for patch@linaro.org; Tue, 18 Jul 2017 06:53:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXQ0P-0007Z8-L5 for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXQ0J-00039I-CG for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:29 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:34671) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXQ0J-000382-2p for qemu-devel@nongnu.org; Tue, 18 Jul 2017 06:45:23 -0400 Received: by mail-wr0-x230.google.com with SMTP id 12so23212149wrb.1 for ; Tue, 18 Jul 2017 03:45:22 -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=gyCUs83XjByHyXu/WryglKBVMkEASitH/De+QUig/io=; b=fy3KnJAaOtZBH5V789W9jp0VbK0648v8SSqQ+PV4F0HLJHp+nB6OVwdyZSn6FQNQUf rJDE3KgCQTSFUmZs9QaSiCUsN77jLL3XjqptW9cTH+mRgJfWKYlJfbhfm2ZW50DCqdKf cwsqklDCLXW4jGL/OudamcdyF7AXmVY7WZFps= 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=gyCUs83XjByHyXu/WryglKBVMkEASitH/De+QUig/io=; b=m3dvwo76C6lbPQt/vLzbIwFuQhLfCRaIxpvbsCzE2KrxOBv4uFmg+slGj1p36Fb2mq AoUYnoWYM9+J8EOiHnWfyi+Qyr2Poh8BVe7sbu0PL7HSP/tm0/wX7IBkWpnxkXp+2NB0 FUU81V7cCFHnAVV9S4qxDr/YY9799FrmXo1Ys52SaclibRQloBLU2EvAtCPPlr0EH+8A I0Xx/2S6RBEKrDupGaGN1aQ2D4jNTcAnPSLdK2oWVWDDYlrBp7Xxlu5KusPqsGHdRalm d468E/hPUKn4R1NKkYd1aHFKzaxr7bIycYHCLlp1yJofUCM3FWboVHwahtq6s2JLP7ht DRqA== X-Gm-Message-State: AIVw112meAPIUwRHpmA0+Nv8AXSfMUeVPSgCM5ViDEf5wTDyRWlBbeIe ESzHS7sl/e96VSFc X-Received: by 10.28.149.76 with SMTP id x73mr1250991wmd.119.1500374721876; Tue, 18 Jul 2017 03:45:21 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t125sm2408001wmt.20.2017.07.18.03.45.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jul 2017 03:45:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 52EE73E04E4; Tue, 18 Jul 2017 11:45:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Tue, 18 Jul 2017 11:44:46 +0100 Message-Id: <20170718104513.23947-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170718104513.23947-1-alex.bennee@linaro.org> References: <20170718104513.23947-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::230 Subject: [Qemu-devel] [PULL 05/32] 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?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We'll also want to support some older Debian combinations for architectures that didn't make the Debian 9 cut. Signed-off-by: Philippe Mathieu-Daudé [AJB: extend commit msg] Signed-off-by: Alex Bennée -- 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