From patchwork Fri Aug 26 17:21:10 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: 600292 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp555766mae; Fri, 26 Aug 2022 10:25:30 -0700 (PDT) X-Google-Smtp-Source: AA6agR6NB4kwgWmGBpDau/2JCoNjcBTRarJtM9/pK66Kr9/zHI6GCYor5TblUp7TnoCdRwnphHo2 X-Received: by 2002:a05:622a:2c7:b0:344:f20f:3dfd with SMTP id a7-20020a05622a02c700b00344f20f3dfdmr690945qtx.414.1661534730321; Fri, 26 Aug 2022 10:25:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661534730; cv=none; d=google.com; s=arc-20160816; b=Qp1Jko7MAHZl2rcxlBRSnXI1W8alyI5ENW7AJcSUJjEMs+7aXSUbhGzgCmSUWbBTTu fZTdaw6pRkVS/vUXsHiqb6vNqd2mQ2J9QNpZro2N2hlggR5keKxtKJnjC5aYCY0eSE3B iXJEHkn1UjQL1yRvvwhfC8OsJm8y9FkcqxkuuFQ/cHyKOsWfFvyx/RhkYYLgUC5A954f Zw1lugB22Jr7vejEZfTUvMb5ZKl39a/A3Tta4UNhPIY66kmSFycAU9TbDdM8tak/6OXl 4GmYrpe66VXjh8i/CIPA2n92ohz+YLIi6azWQE6jQCqozsLkVsGXdC/cAJdo/sJvtLeV RIIw== 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=xKyoYDR28AhCYuT3uUQqYD/QZmqgkSdJelh/Kf1tA0g=; b=U2ExjoC7kt1txvag0OQT/3CwwMBoSwb3YbWQKWuHnY6ZK5Z+M5CY+UNISuThi9yBOE jBzvLc1spcpdbfi+9E8XD4pG4pXBf5IVC1JEbRSXNQdglYBiYZdxL9w1Pw1868XGgFL5 foK2MAQsBJnhg6hlfwBPjWu9ylOIQy3DD26Spw2MhJeXMlwNB6/jv5z3RpBApM1cc/xR pjPndHnmjW7j9l//GVEUA7pus3rlYOyxauRQvPx0vUNg7L0DUW8YfBS+DjL2+159Qvi6 OelkV2RaSv9wi4/ozC1lkMn5zakJym86sRLYrynsTkNbSr8VLjUZy8WzoJ1AQ73xE2bC EpqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b8SmlVP+; 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 a14-20020a056214062e00b00496fe621afbsi84337qvx.494.2022.08.26.10.25.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:25:30 -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=b8SmlVP+; 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]:54288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRd5F-0001ly-VI for patch@linaro.org; Fri, 26 Aug 2022 13:25:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRd1W-0004Gk-Vs for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:40 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRd1V-0002L1-3q for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:38 -0400 Received: by mail-wr1-x432.google.com with SMTP id e20so2537174wri.13 for ; Fri, 26 Aug 2022 10:21:36 -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; bh=xKyoYDR28AhCYuT3uUQqYD/QZmqgkSdJelh/Kf1tA0g=; b=b8SmlVP+TFOSVz0YZKlfFO+aLk/youNbcl3nb9tqaSX0UR0eXudpATyXkWH52BHO3E 2irY/5Jqakf/ivwtNOhdLS7++lcDBATe3gKHFC/ULgK2U77i9wqe20LOBiEq15YK2U+U 1VA+H9zGAB5/+6Fv4fckXhe3ZQ15M1YANOfo9wNXPdzynwb7ZMmnz7yzS+2R/pX4b0Ig AA4e8iQwgstny003zg8mnpxYqV7GUqiGdjhhf1VuCNMrVDmnx7mbJG/9zYNTxjlaQE4A nNkY/J+WZACdCydAN437P0goK8xEtIab/U4YotZS9KjJXYQBrYzoChH+jFCs6I9p+PvA 5deg== 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; bh=xKyoYDR28AhCYuT3uUQqYD/QZmqgkSdJelh/Kf1tA0g=; b=T79uXdWx5Uo+jYnYjDdxy8FucdIKs7nuK7AjfhdKeU3Ry02PzFBi/QVE7iW1M/dCiu jv7MZg43rq7PmLuA8ToQrmJZR6xpgvLNtizE9T6G1mO4D9gWt0I0sE7NVyRlBptbm+Q6 ACyjnr4t/wTkHkj2ZrHz1JmTBIyVlLTpAE1HvlXHCiwKHlW0P59a2/8YxAHWrSZL4t6p Jprb5a9v2AtgtnVIgoXHbhuJ+n95gP+Ti9fo9Fh1oYAndB4C4p2P+zL/P8Y3G16yB/kr C3ez5UTPgBN6p8o9qdEPe3ScRK0/4aqVu6e8Kyt4tQv0rjPzlr/MVm3UaDU75wxFkCUX Yotg== X-Gm-Message-State: ACgBeo2kqYD3YTh4CZtZay0mx8cwWS34F6+eJcEiIiYjjLDwo+E2JH5w pCKjA9x5O0mG4jW2iwQghvKgvA== X-Received: by 2002:a05:6000:156b:b0:222:c789:cb2d with SMTP id 11-20020a056000156b00b00222c789cb2dmr373585wrz.197.1661534495785; Fri, 26 Aug 2022 10:21:35 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id i13-20020a05600c354d00b003a5f4fccd4asm191894wmq.35.2022.08.26.10.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:21:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4E9461FFBF; Fri, 26 Aug 2022 18:21:29 +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 v1 07/25] tests/docker: update and flatten debian-sh4-cross Date: Fri, 26 Aug 2022 18:21:10 +0100 Message-Id: <20220826172128.353798-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220826172128.353798-1-alex.bennee@linaro.org> References: <20220826172128.353798-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-sh4-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index a3bfa483bf..8a611fc824 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -137,7 +137,6 @@ s390x-debian-cross-container: sh4-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-sh4-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 6c2ee3b175..37c4ea913f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 # The native build should never use the registry diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles/debian-sh4-cross.docker index fd3af89575..d48ed9065f 100644 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ b/tests/docker/dockerfiles/debian-sh4-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-sh4-linux-gnu \ libc6-dev-sh4-cross