From patchwork Wed Sep 14 15:59:30 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: 605753 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp845752lth; Wed, 14 Sep 2022 09:12:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR71tCNV5U4cIN0g/3gvVE7rxIsZrkEwUQGoI1UQ1J61YT1HeEOy0TdfZF6CNiH1cCVc7olA X-Received: by 2002:a05:6214:e82:b0:4a0:cbae:2690 with SMTP id hf2-20020a0562140e8200b004a0cbae2690mr33933971qvb.81.1663171930553; Wed, 14 Sep 2022 09:12:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171930; cv=none; d=google.com; s=arc-20160816; b=uQv4Px6CjvZCtCI3lgx45/HkZRMZx9dXV6v1hpm05y7kh2hUsyhgBe/+eXduazzcQG x9v17hplRt2tccKLFwXeo6DUrL2sPGDqzkinOqK2SnIDGhzaOS44yZ+WqFzwR+T30tDZ w8OpfT2sv9WzJC8iP62Bi12NIBh6nuSgySw+NMedbvz5mWbmW1mGXvzmzTverbwqrNLA hsfWaB5174/X5+stwNZ3jTAdYGNxDeKtp+PYmulmuYFI2aPARHFCxo4NdsqdUKdIMhnq +Ns2enKcUiimg1h6KzrzODNuOWM6SqKBSz8pOBWgIXTrbdWnRvsvDIGlBYHMT41QV9iK jfsw== 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=qdSCb6s2r0EoqgxYjN+6ThvDdbhbHDOp2BpkY3tETSw=; b=atVf4CBSO5zz8yQtRIMqnWKIY14lPUWAj3jBdOLci9S7Qr5zsd/bQJI73MaWlliaGL 6VDu1EJPibcM0Sjp1nLHtu/hYrF/CESntOHjiX5JnLwdG3w9pju51I4CtODFGH2+inSR pgv3yFZ/ilcJdO7+Px4m1CIiv0d28xanaq9eZuNEVgNdekz284kjurLJUZJOcXn0qoWb YcQz0cl5RjRjfa+wtNzfy+oOysPy0h8eFDgXCwCNDAe2TFUgjCltcJI/6nJfC+gdRY2H xHOUp9E0z9u7vOcUYsGe50NCuZAOOxQ780jbFWulJYlKgy1M/XIi466NfBUS0nY3EaUl j3/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OY+DncQw; 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 b7-20020a37b207000000b006b912c2e3f1si1486673qkf.154.2022.09.14.09.12.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:12:10 -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=OY+DncQw; 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]:34722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUzi-0005MG-0y for patch@linaro.org; Wed, 14 Sep 2022 12:12:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnw-0006ZP-TO for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:01 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:36763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnv-0002nV-4m for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: by mail-wr1-x436.google.com with SMTP id h8so19454136wrf.3 for ; Wed, 14 Sep 2022 08:59:58 -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=qdSCb6s2r0EoqgxYjN+6ThvDdbhbHDOp2BpkY3tETSw=; b=OY+DncQw+EL/ciPldPFRoGo17xagGL67BCHtDha0832QXt0TTqFj9NmW3pj6RyNvcu O2PgE1vj+5babgSMZcKr51xIWcpwtzUu4u1QlOb3Pn1Cb3W4uLBf5lYTLoKCsw85gK1v O079B899Br1TPCEPTR0IQdyx9tg5QnsQUt2S3zebZ6TTnqqIefxlCvKL+Fl6Q6Q4Wpko OLPTABinY8Y3CyST+WSlQruBlrCyy0cqDY0khbOEm4vg3RZkbkMdxUCPQg2bvWPiDaC6 wEWF0Lg4Kb9x6he9O3z00A5I8jbwp7gVuRLRsayWOJwSgpGG8pgQuni18dy8DFG+AmxH zK5w== 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=qdSCb6s2r0EoqgxYjN+6ThvDdbhbHDOp2BpkY3tETSw=; b=Z0knjXCt/IdN/JDm6i214ir6vTgZOPJ9Rv4kYbOxls/hXBpw4dPkXfUTQyIcoIbwWS /KNGAcluSYtFl8xdKOhuUAF7AEiUtSJ3xwwJ3fKyZr+NNrSZ4UJyWjTO4UrVdgnxLqrN fY/UT8A9b0v1iFBJJE+Rz3D6YsRcSEBZFwOIbOYLdAsPWIgAm5VRyrMrXKSRdoV5NTDA oMjXuV5FZlMsqyqRF/lajBySJT9iQCNszLzeRZu81Dh3cd34ZZzajRLkEwq7yg0i2+dJ 819E7VafjhNMbSF9YILbuMfa/IK4uhfzGot2hlVPbU7BO2QIS1Pe7ouwgNCffxunEYLa aKmw== X-Gm-Message-State: ACgBeo0BW54qDycgLLEsLgWa+T2DGOasBQ9sKDipki2wdVzOrloyfSrl hamjRzSJdpd9XniUyxh/f9P40A== X-Received: by 2002:adf:d088:0:b0:228:a789:ce1f with SMTP id y8-20020adfd088000000b00228a789ce1fmr21108077wrh.461.1663171196785; Wed, 14 Sep 2022 08:59:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z3-20020a1c4c03000000b003b49ab8ff53sm4968612wmf.8.2022.09.14.08.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3846A1FFC2; Wed, 14 Sep 2022 16:59:51 +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 10/30] tests/docker: update and flatten debian-m68k-cross Date: Wed, 14 Sep 2022 16:59:30 +0100 Message-Id: <20220914155950.804707-11-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::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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 Message-Id: <20220826172128.353798-6-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-m68k-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 6c1d765463..15a5270f6d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -71,7 +71,6 @@ hppa-debian-cross-container: m68k-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-m68k-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e39597d35c..95790e974e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker index fcb10e3534..dded71c5d2 100644 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ b/tests/docker/dockerfiles/debian-m68k-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-m68k-linux-gnu \ libc6-dev-m68k-cross