From patchwork Wed Sep 14 15:59:32 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: 605757 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp849887lth; Wed, 14 Sep 2022 09:18:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR5VsHTJxmlgWGkRAAqTWWZrAurNvLMkHfSYfltNKKoixaFjQbiNo3a8xgUne0QtkJ1jRwKT X-Received: by 2002:a05:622a:13:b0:35b:bb0f:e90a with SMTP id x19-20020a05622a001300b0035bbb0fe90amr10499399qtw.441.1663172296477; Wed, 14 Sep 2022 09:18:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663172296; cv=none; d=google.com; s=arc-20160816; b=Dw+IoE7ChRAx8gXsD0NazTDfJemycXdzL8JANpxcnWQE5dWmizi3zJX3dK8SbXIxQq SjReFRCiUGA9ujgZ7eQxZuGwPjOBFKN50uGA+VzXGaUlY/Fv9BY1+VSHAZUZAwW9pUhn GJYFhlhBvFPKfUYKwd6rdZCQ9jdVqvfftyyaCULS67IiSle1o9a+6BuMTzjNQRyLSIpe aiVz3tu3tUIXyOeXg1758iI6xtru1xeD25KqyJG4vylB9Qubl/r5BBiKu+JnZruSEIxk o+UiPRzI9Sfjw+XY4woccVpu2PJjXSxQmajHRXlE5Omulfim8MGNFizxGygcE1rXpcLv o81Q== 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=MGW8Qx1J0PF0RJwo76xRbma2CeONhBpz+sH8ADGaVWQ=; b=YT3nvGDQYgws2/O19iW92nVhHQlc4+TPnIwLJy8ef3xAVLXx34fxjUt9UE2bvd69wv l58tre4Uc/KUPEaiOWOXU8qEoSMuun3DFabwL8/h1AAfg+1NBvY1cBPbEV+ptPrtJhRE mtP04evs5QndAENL7pTARXrVBpBjhtKBUfq2WvaJ4/z0ofeawMqrf0tkpM+douqEeq6S hsCOjD3MWQ9txnIF+NDU1ZNlQKOGZ9gjmQ9ppbi44s3k+Qh30+aErR/j7UQE241pMQ4p idYgsHYmrCKTL+I2hy/vCrydhxBk5/ajoxGQQFUAD/AinqSe3AxBj9x8xpc62jj4DmPa vRhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T/mxWEfU"; 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 c12-20020ad45aec000000b00496c8fac4e1si1622742qvh.439.2022.09.14.09.18.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:18:16 -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="T/mxWEfU"; 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]:50122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV5b-0003F2-VE for patch@linaro.org; Wed, 14 Sep 2022 12:18:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnw-0006Xb-Aj for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0002nc-Jc for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id e16so26442494wrx.7 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=MGW8Qx1J0PF0RJwo76xRbma2CeONhBpz+sH8ADGaVWQ=; b=T/mxWEfU+k0ggsEs9j+Qff0UnLhnysiQ/tNPwr4KYXWA+0YJfRDidXhrx8og9hqIFc zu951AjFZNanT99iiciTbUdqTjBzIwJrIYGpv19p4p3djPxvNPLdaknAlq4hiMw/PKYe tvO3TU/wIjfKwIPettTjSdethmsoldlJUfdY4e8A5sfYHBBTxJBAiOpPXUb4cUobWTU6 xad23hS3u6YQxjakH7rhH/wLtGgXJ6DvZG3CQhLf4sEcDqobODF2jIffDeJOmbSusrLs NnDXpTEVjG4SmDDnu7VqUoE/3tmeuijeXHMRvaO6wu4roCy+Z/wVxvEYEtuJTtdcoxdY J0Mg== 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=MGW8Qx1J0PF0RJwo76xRbma2CeONhBpz+sH8ADGaVWQ=; b=3/AhuDeN4llOGkLndPyI21I8R/HVTggpHgXScXTTsj/hxbH470GhdbbM/zOOfh6dGj jBTl8mTqbWjucdQhAU1dhWk+OI6DXd45YW51f9fwRR5htaJ77wH4KswX/o+hVXBj2fxR WRfXhsl7qWNhHnu1wHKkM037bISBFbMiOSfv1Qk0WjrUCcLCNfF5oD1596ki0nGUQnsV QuB2Anx3ICqMu+PZ5fzA/AKopynLSepGs0aRtayTpnyETjYVm/uV/VpPmup6YyZMBv4r 0cF1f93GWeaNxRpr2JEw/ZwqtF6wITMunaBhvlwL5K2pN8fa/iWriIs1eHauhFx03qEK enkg== X-Gm-Message-State: ACgBeo1WJzNmj944qt1Y3L1b27TqKEYka5D49FDeSZQZwWEch2nU8JuQ rc8QiZS8YofQhbtocMIhJd7sZA== X-Received: by 2002:adf:fa82:0:b0:228:6122:9903 with SMTP id h2-20020adffa82000000b0022861229903mr21846137wrr.144.1663171197247; Wed, 14 Sep 2022 08:59:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id id11-20020a05600ca18b00b003b332a7b898sm17207403wmb.45.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 644B81FFC4; 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 12/30] tests/docker: update and flatten debian-sh4-cross Date: Wed, 14 Sep 2022 16:59:32 +0100 Message-Id: <20220914155950.804707-13-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::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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-8-alex.bennee@linaro.org> --- .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