From patchwork Tue Sep 20 17:15:16 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: 607640 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2042288pvb; Tue, 20 Sep 2022 14:47:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ukPwfXsEse07Jo4CUMq0EYsP8PaKm+3vPEtq5hy9+2X0reDlV7mEe4RCCYdQ6DUA+EYn4 X-Received: by 2002:a37:a943:0:b0:6ce:731:997b with SMTP id s64-20020a37a943000000b006ce0731997bmr17717356qke.344.1663710443639; Tue, 20 Sep 2022 14:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710443; cv=none; d=google.com; s=arc-20160816; b=TjbD9BE2migwHCXZYMwasnzbQQVxgS6kJR87nuvr7+iEfH6lleVE45WaMjY+nC9Z7K yDvp4s2H8VFHwBGcW77NCthM6SQ2qwhruzek4gQz17DNMo2QQx0BlSju37q04vRutnj6 Xn8bRf+I3F4sJmdZjH8sXycMciHF65WGFbix4RZb8XvTN55OxmFzK3+F7C5BxC0g4ez5 vuc8sMMysekBsXALH3KJJJ1vb+2G4Xd3/W5pdFtFMEp6aXeyl5qiAzWrlTlDSU34XWwj zjKO9/qD7WfD/p7BsaftI7YnB3wwk7TmiSUdMfmsNPCGAN3Akg0waKjmZyNHVsLjr/ul BPjg== 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=lGP32FeNcGkLN1t0VFLZXvScNyvJq9qr7BUy9LY4/aQ=; b=AC2NDDxuNADcDvGbw3Q1QdcArY9s0CXFbAFFLpAHotVSYxPdFg3vpWUXMUDKYf6Bt/ tnLNIn8LjF1vkrpncaD+darox2vFSQd8j6Q0cIZqKDQmobDNpkx97Mja7z6+q/DCqBDK eUC9ciPeyyV381J6kAPBNTvIKeUaGlaharxoWp3/qy2cBT2NejB+vGexW2c1fun5chCV LHEIKUASQ7RZZ5YmbjG/W+ZPQ6wS2sR3zyWWSbM+hn3TCCXg/T/Y8Lcuy1TVd0J4fi0G ou+3rVpm8Abs/8IDnyd01BfDgjrvQBUxg3fHGyFrkUFPr2rgBDsOLCTIz9Q5MhxJ//no fyLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E4mDEK+O; 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 q18-20020a37f712000000b006be7216eabesi540318qkj.530.2022.09.20.14.47.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:47:23 -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=E4mDEK+O; 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]:54526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal5P-0007SN-5s for patch@linaro.org; Tue, 20 Sep 2022 17:47:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzQ-0005fT-0O for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:56 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:45568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzO-0001nE-8U for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:55 -0400 Received: by mail-ej1-x62c.google.com with SMTP id dv25so7763065ejb.12 for ; Tue, 20 Sep 2022 10:24:53 -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=lGP32FeNcGkLN1t0VFLZXvScNyvJq9qr7BUy9LY4/aQ=; b=E4mDEK+OKb7Wre34iiO/oJwScIXh4aML9KfAm/ef3LeftSxfV9Jzo98RelgCCslG3U yDQcJ3bKH1J8zMSjXkfYv8X5+loykC/yNp/BPyc+WwjzbQooBWgNkC5BOr0WQKItJK55 TrPJqjeVDsv3aR540HXhtuNAw9c0DuH+RlzscOxgV5WJtZYJqoztM1/aCLxRJK0D+b22 3kvtKVjZxqF44xB4fdpdtGAThBGnpsNHIzMNiMneuu6FRez9yECTzCpfNdeRa4fM5wrU 22wqX3Rr8sdBod7MWp/etW7zH319kMVahqrdTPFprB2pU5K2mj2rqN+uVjJawxS5pLfe haYw== 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=lGP32FeNcGkLN1t0VFLZXvScNyvJq9qr7BUy9LY4/aQ=; b=8JcdgLPHSablNSXq300bvS4f5bRKLuNuttZ0P+gxjva9/7gBeYe1yRRU11fjlKV/HK 6YvHVt3meH1VIudGxgn2u1PCWoYNdvxcLh13fg8NhVyvj2rc24f31yDa/tpbcC6xxgNT WN8jI8UHx+3NZePgVC8Vr4b6cGXGArfOtPHIa2j5lb8ETGBYmjR0ZAZGyzd9om6omZbv 9ankd4+8L3WtU8TzdIJOutjjQe6sPmBfBpFxYSP1pSEa2HRu0BXkzhOkUfV0KJnX2IU8 iL/4pX90K1gmH1/VwmJ4dStW8pprSVizaqNJlDRLqCYK37Lh95WMxuxOMpXTXHjbhXL3 8RwA== X-Gm-Message-State: ACrzQf09tSPnuxBef/klXWLG+Zr1pvJROp+EOgL1CFZeILqTsluL07at TB82NAvrSmiUfskhWiz4gj2k6g== X-Received: by 2002:a17:907:a043:b0:781:293d:ea89 with SMTP id gz3-20020a170907a04300b00781293dea89mr10321826ejc.461.1663694692535; Tue, 20 Sep 2022 10:24:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id ec42-20020a0564020d6a00b0045393e56488sm200375edb.58.2022.09.20.10.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0DD361FFC5; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 13/30] tests/docker: update and flatten debian-sparc64-cross Date: Tue, 20 Sep 2022 18:15:16 +0100 Message-Id: <20220920171533.1098094-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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=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: <20220914155950.804707-14-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 8a611fc824..db0ea15d0d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -143,7 +143,6 @@ sh4-debian-cross-container: sparc64-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-sparc64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 37c4ea913f..8828b6b8fa 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-sparc64-cross: docker-image-debian10 # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles/debian-sparc64-cross.docker index f4bb9b561c..8d3d306bc1 100644 --- a/tests/docker/dockerfiles/debian-sparc64-cross.docker +++ b/tests/docker/dockerfiles/debian-sparc64-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-sparc64-linux-gnu \ libc6-dev-sparc64-cross