From patchwork Fri Feb 24 18:08:52 2023 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: 656262 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1043658wrb; Fri, 24 Feb 2023 10:10:42 -0800 (PST) X-Google-Smtp-Source: AK7set96A+k58k0GNo5l7sH8d3qnM+ouu/knnXQh85775igGwMMe0CMluN9S7wKYgsMtHM5IHqRC X-Received: by 2002:a05:6214:300f:b0:56e:9298:7a1a with SMTP id ke15-20020a056214300f00b0056e92987a1amr957843qvb.9.1677262242470; Fri, 24 Feb 2023 10:10:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677262242; cv=none; d=google.com; s=arc-20160816; b=eeacwNF4mwq8O1PsQdvTagVtaNwWBDf1Gs7ttxv/E8BHKZk04a2mNdVnpolHLwjLww lkiCKsjp6x4wqSUczcgtnY6AVk0rAYjvTg1TuTZ4Sji6XpSWgGmWRwoxtcn3MzBJ5D9E OK62qd+BL7gJf/9czWQtD834CkDFxx/mIVQCM9s2/XMYK+v4nrt0U4YeULqZR5DxVwu+ R7sIaC4AfvcW+0X8X6TaysWWeGY4F5bXojyN5NLywC3Cy6RBnF1qKatFOFSTzwEviPjg 8Qetlj4R0Fy9zW0g9whAnKqVgQVoVsa0MmZpo7mcwhClSLkvajkEkwlp5obN2l/OUdEU CNFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AFFga98mTvSLpaYsI5+GZ2pTSutF+AdzB9RPsTcdBPA=; b=TDlBfuasZpVGSlk6idYfq+akn6dD6VHGbe/XU4KuKyUx9jK8vPcpVsOXhblApXsljB Y+MQeyb79w/wG/w2biH1t4zLuA6Fd09+a8iWuR4qDFRHD+OpEk58O1SsxPQlQMtxaX2Y pAKiuzBR493qlAtOE0aOutQ4n8Wq1D6RQmNoEwoJRJlb6kExlX69Y0/eki6Tl9z7UvgT fl3L8VxNydg0ORnMkPl7spiscfn7njbdZty7Z2/ZXirx0ClWNoyt6oYewiVa7onHG22n u3vwOEoeMMNSyQ7AWL/3XlyaH48F5powIch8lmUvCKspVCC7mAy4v5gasRYyt5CgekhY n4Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wMoORneg; 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=pass (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 x3-20020a0ce243000000b0056ebe4b500csi6155613qvl.482.2023.02.24.10.10.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Feb 2023 10:10:42 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=wMoORneg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVcVF-00056J-T6; Fri, 24 Feb 2023 13:09:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVcVD-000543-TE for qemu-devel@nongnu.org; Fri, 24 Feb 2023 13:09:03 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVcVB-0004p1-3Q for qemu-devel@nongnu.org; Fri, 24 Feb 2023 13:09:03 -0500 Received: by mail-wm1-x32d.google.com with SMTP id m25-20020a7bcb99000000b003e7842b75f2so8752wmi.3 for ; Fri, 24 Feb 2023 10:09:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AFFga98mTvSLpaYsI5+GZ2pTSutF+AdzB9RPsTcdBPA=; b=wMoORnegUQjEk2IjUZqiUrD7tyYazQa+DKsPXxSdgn9jU8FsdP4hEOHCgTKttfRVdZ 3iq7Y9IB57jaGXAP2fTV4sHA04OagDhhik9wMIoNeVd/q9tNb9Px0Ho/J9eCFF3POq62 8k4h+31PMOGW0S+B/3/QHXLJaq/Nqbo84Xg3bpyYDYBfXgvM94A16jH5kH9+io3lBaae PAlUzrtyjgkH74jh9NojkrFyD9wdF50FjAUgHkJlJDo6WKCyyQJERFNSfWazWuoSP8gt XuApMmJGc9ZUWaa8Wi8r4tYwj/S38omRJ/Ia35E6qO5q8TQZIxlf98YqAaKjPZiaUViG /l6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AFFga98mTvSLpaYsI5+GZ2pTSutF+AdzB9RPsTcdBPA=; b=7zkdKFqPg9d5zlVzvRA0yfjc59hwHzvGl93SJmqEItyxvgriw+fekUzBAZN5FHBTMO kTngPBOSgKjeYHh/lG2500W2C1eHsLPByInIG/zkOEhtqmJrw9lFFGLGC8cfWheC3TwB Hg9f98rOoLviS6zfgl62G+R6a04m7CoqMOvCpLRuTVF2TtEB4TdCft52Dkm8Jr+Zcg4o 9DdMevAEeCSVNnV3FY5IuGPALmxbHOgUzsH6U5Ty78AXbsGamM7KtJA1egg0EUjEVRo1 1aprqmFJG2Ao1fGAQC+a1a2Q2gMuj/IaFfIW3m8J7ac7ysgQmdOhdeQfGCnFpf57ctDv 5H4Q== X-Gm-Message-State: AO0yUKWUVRa1R/NnpnVPp/6hvKgilYgLb+JhumTtNTGdwakOWW9ayb4b Yqy5pyepQfOIriN30EqMK1OXQw== X-Received: by 2002:a05:600c:1895:b0:3df:1673:90b6 with SMTP id x21-20020a05600c189500b003df167390b6mr12652229wmp.39.1677262139675; Fri, 24 Feb 2023 10:08:59 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id c11-20020a7bc00b000000b003e91b9a92c9sm3864655wmb.24.2023.02.24.10.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 10:08:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C71B01FFBA; Fri, 24 Feb 2023 18:08:57 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Li-Wen Hsu , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Kevin Wolf , Stefan Hajnoczi , Michael Roth , Qiuhao Li , Beraldo Leal , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Cleber Rosa , Yonggang Luo , Ed Maste , Peter Maydell , Aurelien Jarno , qemu-arm@nongnu.org, =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Bastian Koppelmann , John Snow , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Alexander Bulekov , Hanna Reitz , Bandan Das , Markus Armbruster , Darren Kenny , Wainer dos Santos Moschetta , Pavel Dovgalyuk Subject: [PATCH 2/7] tests/dockerfiles: unify debian-toolchain references Date: Fri, 24 Feb 2023 18:08:52 +0000 Message-Id: <20230224180857.1050220-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224180857.1050220-1-alex.bennee@linaro.org> References: <20230224180857.1050220-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We use the debian release number elsewhere so fix it for consistency along with the broken comment. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/debian-toolchain.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index 6c73408b34..dc9545857f 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -30,7 +30,7 @@ ADD build-toolchain.sh /root/build-toolchain.sh RUN cd /root && ./build-toolchain.sh # Throw away the extra toolchain build deps, the downloaded source, -# and the build trees by restoring the original debian10 image, +# and the build trees by restoring the original image, # then copying the built toolchain from stage 0. -FROM docker.io/library/debian:bullseye-slim +FROM docker.io/library/debian:11-slim COPY --from=0 /usr/local /usr/local