From patchwork Wed Sep 14 15:59:47 2022 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: 605767 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp865468lth; Wed, 14 Sep 2022 09:44:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR5OlPwxqLUWPjlg9vBIDA8hZ2nFxn75cnYGqlxGlWGHzkEvMkNLuH+H6dkIksv2XK1uercC X-Received: by 2002:a05:622a:513:b0:35b:b42a:9bf1 with SMTP id l19-20020a05622a051300b0035bb42a9bf1mr14523995qtx.339.1663173844532; Wed, 14 Sep 2022 09:44:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173844; cv=none; d=google.com; s=arc-20160816; b=Z2uoX7bL3tocQPUy8eaqw6Y//I27WgxWeqsVTJzMQ3r/5oLKrMCIFvcjLscJyiy9LB Gs4KFvbRkBFPExK2GCvl5CAiH6cCUVP8hCOBHMZ4OtIdWp8M98F2idIGNNmXnQOZhk2R NNRGP/GTlSYtJ1WnKb5w4WOQqUuuifj9cgnNaWmrOTbeMDXJNRwuQ2mutYSGM5fLUZHi +U/a/3a5QGfH2Fks327eN0gWS54msS4d9YZrdsUSy3RBlmxFzx5WnLz1ZqW6fjTbtdGH R87auF+/4zASmfgxir4aWqjcC+3FA/RMkMnlAVKq18Vnw3VgX6Eyzh2iEMx/dVwtPSCg /2NQ== 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=sndVtu5XcqEXirLEG2n7a84U7O29s/uHZwqERDBcl2k=; b=KZDZFLlmYhT2f28a/vfPr8n/NBCW9w+AtvQnz55SOwn5jUha6sJqS6ZXcpbSZBrkos Yex/nGDVS7ikBxD+ESjqsJ5LZqDatLHYDW/hw4+6cC6YbBCHWFinzn05go617d1kB160 IgMeqSt+C0qY/OjZ8bQHEYGKPYrXkjQgQbtby9Ss72CZYTyqvnPQYdGw8a7Tg/L+jq4u ufCDeH69QXQPeBpiz9esfIUo/O9WGb+06bRD4mkxGvGAk1c6HW3z0teXsl+h2xW44be2 SOwbd7WyJ1PpNeeDz/rfSqmURUyuRra4uOlgSM0QMqGcyx9/8GxmQm6S0wo3SnoDOy+N 3Dow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LfyssLbA; 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 gw12-20020a0562140f0c00b00496b42cd3f4si1627773qvb.456.2022.09.14.09.44.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:44:04 -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=pass header.i=@linaro.org header.s=google header.b=LfyssLbA; 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]:58954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVUY-0002jM-J6 for patch@linaro.org; Wed, 14 Sep 2022 12:44:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUo3-0006kr-Gp for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:07 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:46716) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUo1-0002wA-3n for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:07 -0400 Received: by mail-wm1-x332.google.com with SMTP id n40-20020a05600c3ba800b003b49aefc35fso2595299wms.5 for ; Wed, 14 Sep 2022 09:00:04 -0700 (PDT) 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; bh=sndVtu5XcqEXirLEG2n7a84U7O29s/uHZwqERDBcl2k=; b=LfyssLbAkoW+mDkLhAMGJjUzR3gQuO5tBkk6a8qn2kw5lHWdaZZDN1TyJO9c6CTvMJ mq7yaFN8kufeEQPv14rJl4OCy0jUb5t10xwjUpS1Xw1wsCQsPVQ7eivfMWapnAwDHJsE o2arRKnVaEWjlyZNZshcuKHtJ8OTvJYlwiBRIcXyCOyJP/gNb6/JL/QhWA05lZVBvP50 ySVzLuxSc6PfsBhgJoBGGsD4bEZsyPYaeUvLK8iP+FbeBbxcZQr4/TftScwT65qu898H OPdkM0G2Es0qhIVr6hFK5TjjPD0HP8XYjthD5LiZflYA2Dh5yAJmlO9T98j7jzKzgMJC EB6A== 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; bh=sndVtu5XcqEXirLEG2n7a84U7O29s/uHZwqERDBcl2k=; b=kqXIKXJZa+hQjO6IFLzmJ2DUfsVfPI2xdNSKiPyQCe+DF8T9YCUa9bS4a9DgYIWw8f Y7O8rW2yWTCWADS/jhN9k5JAmNiiw63axnBGXtejXTEBLvQef/DFowD4/aHBtA6D2Tmv nM590FBSy7aYQNM6YP+d+gM4M9rqtLE2O4Xfb7I/X68tKTRGsVFB9GFXmp7r/e7PX3ev SoSfCFodZw104qnfLk0Q3oXVvtipvzSkIDII+UUTkhko4zbK6+tfEvd1k+oy+uFt9NOm 6eCzpeOWm7OC+GsRxFb66FDaOeZAHr4YqlEesa6LE1fu2N5raBwAQngL/B0QVMv3gS3q cACg== X-Gm-Message-State: ACgBeo2f2+UPXezueKzIrJRt/IRkEc/jY4GVBGZT4BZuj9DLJWFZJglt e1SugQYaL5n3xpzXBa6JeeS1nQ== X-Received: by 2002:a05:600c:2c4d:b0:3b4:867f:1e6f with SMTP id r13-20020a05600c2c4d00b003b4867f1e6fmr3753373wmg.75.1663171203799; Wed, 14 Sep 2022 09:00:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b15-20020adfe30f000000b0021e6c52c921sm16859002wrj.54.2022.09.14.08.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:00:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CFC341FFD1; Wed, 14 Sep 2022 16:59:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 27/30] tests/docker: update and flatten debian-hexagon-cross Date: Wed, 14 Sep 2022 16:59:47 +0100 Message-Id: <20220914155950.804707-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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, T_SCC_BODY_TEXT_LINE=-0.01 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" Update to the latest stable Debian. While we are at it flatten into a single dockerfile as we do not some of the extraneous packages from the base image to build the toolchain. Signed-off-by: Alex Bennée Message-Id: <20220826172128.353798-22-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- v2 - use debian11 consistently - remove "stand-alone" comments which will soon be irrelevant - reword commit as we do need some extra packages --- .../dockerfiles/debian-hexagon-cross.docker | 19 ++++++++++++------- .../dockerfiles/debian-loongarch-cross.docker | 3 +-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index d5dc299dc1..8d219bb81d 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -2,12 +2,10 @@ # Docker Hexagon cross-compiler target # # This docker target is used for building hexagon tests. As it also -# needs to be able to build QEMU itself in CI we include it's -# build-deps. It is also a "stand-alone" image so as not to be -# triggered by re-builds on other base images given it takes a long -# time to build. +# needs to be able to build QEMU itself in CI we include its +# build-deps. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim # Install common build utilities RUN apt update && \ @@ -15,11 +13,18 @@ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ + ca-certificates \ + clang \ cmake \ flex \ + gcc \ lld \ + make \ + ninja-build \ + python3 \ rsync \ - wget + wget \ + xz-utils ENV TOOLCHAIN_INSTALL /usr/local ENV ROOTFS /usr/local @@ -32,7 +37,7 @@ ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh RUN cd /root/hexagon-toolchain && ./build-toolchain.sh -FROM debian:buster-slim +FROM docker.io/library/debian:11-slim # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list # Install QEMU build deps for use in CI diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index df578da40d..a8e8e98909 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -1,8 +1,7 @@ # # Docker cross-compiler target # -# This docker target builds on the debian11 base image, -# using a prebuilt toolchains for LoongArch64 from: +# This docker target uses prebuilt toolchains for LoongArch64 from: # https://github.com/loongson/build-tools/releases # FROM docker.io/library/debian:11-slim