From patchwork Wed Sep 14 15:59:31 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: 605774 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp870937lth; Wed, 14 Sep 2022 09:54:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR7/CR/WTcUHuE4hGlxI/U2yhpXs0DK25PNryoe9KU7ouYiFKftmSX7xB2s7eUCKKYYZQ9nM X-Received: by 2002:a05:620a:4706:b0:6bb:7e1b:5f0c with SMTP id bs6-20020a05620a470600b006bb7e1b5f0cmr27171476qkb.340.1663174478448; Wed, 14 Sep 2022 09:54:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663174478; cv=none; d=google.com; s=arc-20160816; b=pX8ghTqrnD2Rga/qSYbjdHSdzLQEAZIx/ZfliL0ex+qTtdDC3JmoTpndT36GXTtPLg o+h0za54k882NLzjhR51h2Xao+7SCqWeM1Asb5wcDu0+g/sv+YS7t/8miM1bLogseOaA TbZPDit7XIQES+GDZzOxAy6znbCf2GCSRWXe5YObxoVNNs8ltLAWqNGw9/WPa7SCY+yc y+1rvFKgFYk70jSTzmNeAleUygaUYhw8RBX9B+JXYtwZRTvSfUU/FX5fA7PojfrsHYca BJ9ZYBj4Px3YFCzpniFbgydkwC7KsXIlUwL7bvTPb3QL4aMh9BnusA4WC6DufIEYIdWj VorQ== 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=U2JzAVOHBmx2p6Y9jlhkKfmMcAlVs01DcSLL5ELzwk4=; b=txHqD2aLOzLaXTis/KCPNNQfhIIDphC9Kd3yFmvxoYWmDlDjZ9pGvwZM1OecaVcYRn tCwkKKFM7jlZkV8URTlTC2nzL/6CRd7YsQLJQrNQYbjwwrdnQyXc47gSgwRiszk8fWFO PWnQpWGHORrT0Hamm8ghliEIxYSllQ+KQ6c80qb7IhzzTPwwqBvdVJ7iVIIQRTyllQgP wXQxAjcNPhk8Pdm/jAEVGunpcIRqR3Dfv/JflLMWIaXOaw9ZFf3/B4xh25M+IJLpBUIV zGagSgVsKS7ItaZNltR9BDCIF9Clib5LO1jvbWymDC6wZg4zhbe7yF6HWm5yX+7/c87W kKKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QizJrc6m; 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 p8-20020ac87408000000b0035baa2bd813si402201qtq.127.2022.09.14.09.54.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:54:38 -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=QizJrc6m; 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]:40976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVen-0006TX-Tp for patch@linaro.org; Wed, 14 Sep 2022 12:54:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUty-0001Nu-ID for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:46749) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUtv-0003qX-MM for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:13 -0400 Received: by mail-wm1-x336.google.com with SMTP id n40-20020a05600c3ba800b003b49aefc35fso2608479wms.5 for ; Wed, 14 Sep 2022 09:06:11 -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=U2JzAVOHBmx2p6Y9jlhkKfmMcAlVs01DcSLL5ELzwk4=; b=QizJrc6mW/B4qufDDSvFmkWDvaCy8AN3qyuKGfZpdae4dtFKhBV6r2/c7v2Y1bSML5 RZyd6BbkxhRTEv7EyPzCbOv5k4GvGLGlt6HcsELR/WGscbMigT63pmfHpc+ti1uamqQP dO3119gojy+JZwSKE9TO66MHI6rbOGVOjorWrRI6ll4uPbFHp8IaNXioz4PtdpTUrw5s Y7OzhiY76NyW1oVmKsa8Hra9b9SQAUMcXv+BQw50G18OysczYmojRxMkzcuGfdzYgiKn N83520PGrh+5iptYpNDqmoPyWh2QPWxxTa6bPIvcTz01QtiouGEFbyMVm+tpczEW5A1s 9wSQ== 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=U2JzAVOHBmx2p6Y9jlhkKfmMcAlVs01DcSLL5ELzwk4=; b=Bv2RGGAXoKYAXTuCkwwsM5AgpCGxUAqQF8NI5fNVxZPEDUnU4VAks5ir/Q/7I/LEJD hmuKGTddCeL0G5oR9EGQbeP5SQngym8qLHWxm49cvx6N/aiWyntYB0rV9H+E0L5phtWZ U1MjzTVMiWvPtS3sGtLwKclOG7CsiOtPFA1Vqb/jj52Zoyy3lPi3PH0v0ZJZ9FdBHMtO FN0jN7rvDIN/tbBSXvV5yoBRqZ21S9vcNMrgyaNnD+jcCDoU+riVTLLAw+teuvaGYShf vt9cfw+r5Qp1Nzb+YdeV1e5B3FzbB8PiCkwm8HmCUCxnzjzds3ooRYq1jJk9XhKGqIkV QgOQ== X-Gm-Message-State: ACgBeo0l2oKnhCDJF48mzXoV2wXOFqAfLUrNh+mv15RNRWAEQ3gVBvtD QVDLZpU+XYB5mpUgXGs2j4RSxQ== X-Received: by 2002:a05:600c:4f89:b0:3b4:a6fc:89e5 with SMTP id n9-20020a05600c4f8900b003b4a6fc89e5mr744104wmq.149.1663171569997; Wed, 14 Sep 2022 09:06:09 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g1-20020a056000118100b0022a2f4fa042sm13552376wrx.103.2022.09.14.09.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 486AA1FFC3; 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 11/30] tests/docker: update and flatten debian-mips64-cross Date: Wed, 14 Sep 2022 16:59:31 +0100 Message-Id: <20220914155950.804707-12-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::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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-7-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-mips64-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 15a5270f6d..a3bfa483bf 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -77,7 +77,6 @@ m68k-debian-cross-container: mips64-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-mips64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 95790e974e..6c2ee3b175 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-mips64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker index 09c2ba584e..afcff9726f 100644 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64-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-mips64-linux-gnuabi64 \ libc6-dev-mips64-cross