From patchwork Tue Feb 28 19:06:43 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: 657475 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3096799wrb; Tue, 28 Feb 2023 11:08:15 -0800 (PST) X-Google-Smtp-Source: AK7set9quKAvYWpHaqChdyd+k4oizUDbWkK2fUBJsb1kMo/rcsakPA0ecmsEantKLPXLFrZ2lSKj X-Received: by 2002:a05:6214:5013:b0:56e:f1fd:f177 with SMTP id jo19-20020a056214501300b0056ef1fdf177mr6822593qvb.42.1677611294896; Tue, 28 Feb 2023 11:08:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611294; cv=none; d=google.com; s=arc-20160816; b=y/NBR1UnMF/4kb/3y9WlbjL0nzmIAgb9/gA0Xz/tgpEwwd/FPUf/TRMDciD4mEMS8i 20MyxlTniFSf6PbOGrQdiwilFTZz6HbYxK4dTPg6BCN24bsvHQahFKt/QslhFVAdP10Z d/aUvwCanEgv1pcOM3cw3Ps9Qb03/QDyKDO81NVmjbxXJGg7oIdDN3dd6eJ+OvqB2nN9 SPNl0pBC+bbBuubcYXt+hsnPd6PFxBFZSrM6boLtIV7vUeWgqKZ7KPeXUk3Kvu21k+Xs U78CO9muJgMFdnfD60Z7npxqfjFBkYfOtZQn9iHGJsKOvJqg8dwKzgH5SpoHpJLZgDUs z0+w== 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=9Qt5mFGK6sX05ojDaxMAjvkBlcEMddgn+Oj0DLlJ4YA=; b=ACWvI7arP/53bjsbMv+ZVuk/HnkjMzEd+BpwuLchURuuPNe932+JaGUcE5TMa8Dr12 B9SSGs/KPoIs4S2sZ9E0Fhbhj0QBxfPZQdU9GoaxyczheXds8aRQ7xpdnZpZbVtiG4iN +NyuyV52b+MzRp93vsSCMzHeCrz6m05gnex57U9gi42fpI9tmHuYDTJfpZPvGhbyg5yD mM0ZUIgZQiqS/5O510mm79UGxszmeLmvLppB30VJeVlaYBdLSCcojy/z2OZSN2Ab+n+a oWK6LFQxAXkHDEvHYY9zNeHKC2Z7a3cL8rGwgbitUE7GscdniZHBksjG3/Q4AFX0Ox/L sqHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mF+1ji7z; 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 d25-20020a0caa19000000b004c77f3d9e3dsi8754609qvb.278.2023.02.28.11.08.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:08:14 -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=mF+1ji7z; 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 1pX5KJ-0002bY-Gk; Tue, 28 Feb 2023 14:07:52 -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 1pX5Jo-0002LU-7G for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:23 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Jj-0002lF-Qz for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:19 -0500 Received: by mail-wr1-x42f.google.com with SMTP id q16so10890758wrw.2 for ; Tue, 28 Feb 2023 11:07:01 -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=9Qt5mFGK6sX05ojDaxMAjvkBlcEMddgn+Oj0DLlJ4YA=; b=mF+1ji7zNQ28pO6NBP3EfUyVvko1tHKSH/WLpIRB5b1/ecWQsUiPE0/PQHkNSO497S dSDF/QL8kNyi4JN5z6kmmLTkcwT4V41ySSXSEVAMA8YwsaYYsVEguuzmJgbLpaRrEB96 X2WNyI3exEINI3enQ5wpkLLl01djvTBamv6arCZXvZzaVGlMKU5Ni863WnhQEuO4Jim0 AZHPnu29qal5jVhIP/LJKcRdZm/prJWGv3SZRCYA/j//7ApParXCN94bDIgNyJGpRa/x W+N6qb9PYGvPrzTdoOXW/QzqGqcVQR4joOUSSN9QaaX2VEr0YqeXvdIHCKV+GjiALWou SYUQ== 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=9Qt5mFGK6sX05ojDaxMAjvkBlcEMddgn+Oj0DLlJ4YA=; b=HvEv68TejT8g0tC5fy/dvnhbVHD0/CaTkrZb/ONFrnIWHHOLQbou4GzYzq9joBZYq+ MrLuRB/tAf5D0QOMoUN2M0gN95r7a8OIDYA6NlkiI0s+0SqyyIknNHvJ5ybr43OA46G/ RnN+z5K/sQXLF2ZfZORRoRuoExFHz9bd169/BSaBJUWl+boiX9ZvmDbUjtwIr9nXsTxn kNpqNKewp5X11L4qG6VsadlkcjlilCPZIjfh3RRO3XA8y3yAcymNl6vGiwE7xwN5vIg7 NUPcBi8CPqJYq1VxDr24aWHLQSGw9HFX6HqaqqzvThFTcYS92lDcAm9kB9/JsZJoszzB qkww== X-Gm-Message-State: AO0yUKXEnU/FVu+pJV0yKYy0nqqCEYIIf6/b5liFUn6IVBXS2V2YQkI7 rNC/wB3jYyygN7NasR7IHrPdyw== X-Received: by 2002:a05:6000:789:b0:2c5:3fce:423b with SMTP id bu9-20020a056000078900b002c53fce423bmr2819757wrb.4.1677611221534; Tue, 28 Feb 2023 11:07:01 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d2-20020adfef82000000b002c5801aa9b0sm10730547wro.40.2023.02.28.11.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E10F31FFC4; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 14/24] tests/dockerfiles: unify debian-toolchain references Date: Tue, 28 Feb 2023 19:06:43 +0000 Message-Id: <20230228190653.1602033-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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=unavailable 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é --- 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