From patchwork Wed Sep 14 15:59:29 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: 605752 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp845722lth; Wed, 14 Sep 2022 09:12:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR4/2XlkKvDYNvA7jKPt7YWDq7pXykXc/YhyynZ2tcscYMvpBLSDFQ1wEgxE3zsZeuQeMeB8 X-Received: by 2002:a05:622a:170d:b0:35b:a558:aee1 with SMTP id h13-20020a05622a170d00b0035ba558aee1mr20729032qtk.527.1663171928014; Wed, 14 Sep 2022 09:12:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171928; cv=none; d=google.com; s=arc-20160816; b=rVE9n8ApiFqbChXCTwLdJxKHuD5Xb/wniMtX6oKbueisQ9pujdTOFwn+y/zZw1I8Qg iypniUL6SGUhMKf0t2iQc4KEn/vPOBPEESPBhHqhJh8a95lY1UmMn1IL7/WtMKjM6EyT wBfPMaABIBE+O84rXDredyu5eGdPnoUTmaOylUizijl5bkgaomXQZe4eYA71qiyPMz2V H17CM1RH5ybreQ0Di3TbecR6yLt3QJiZFvsQ5lavp31cOySrr9YSEty0U9y9+dyMrV/q WRQ8+kmIwkLD+7ti1zq3rhyNR68LbZsbQiMx+UJe5eb3v3IyTBWNHohtqW0WxIgDIV5u LjOg== 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=IqaLr6BFu6QU3p+4N0XxulwHFk6+V+czeiV89fAmciE=; b=IjQ5xS0e6yfjmgTRO7PSssQuP3CpCICskOgsG2w0nu7vx6I6bhf3dChfJDHsoP1wvu cqbHPDL3V9Iv4uUKoKqFr7nIBgaO2BQqLwNTx2PZr/UmliK5V9X5QL7qWGR7E4MoDUOB uwhF2e88IIOYokEmzQ2xnFCrng+eIoLYKFYO1HHWQZuxVVlKTAj8hN64nTyzEjhdpd0u 2vOgJQvX3FwW/2Dm/S6ASnpRrap7yvQr9xbLGF4O0jSftp7F+fMxhpoDwS9YiGdebnwr e2G99NiueuZ9DH1n26Bf9Lk+s40YRfdy9cjwZvn1+b18GColtN0RbnntvmUvPcfsNY3B W9mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cyK/SugH"; 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 b23-20020a05620a0cd700b006bc1512988asi1223092qkj.572.2022.09.14.09.12.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:12:08 -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="cyK/SugH"; 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]:34718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUzf-0005H0-GK for patch@linaro.org; Wed, 14 Sep 2022 12:12:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnw-0006Ww-2t for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:39509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0002nQ-2l for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:59 -0400 Received: by mail-wm1-x32c.google.com with SMTP id bg5-20020a05600c3c8500b003a7b6ae4eb2so15807204wmb.4 for ; Wed, 14 Sep 2022 08:59:57 -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=IqaLr6BFu6QU3p+4N0XxulwHFk6+V+czeiV89fAmciE=; b=cyK/SugHz1QH3TSXU/J5Cq1IN/y8vABGNbMYH6vG9c5glzOcTYs7dbNyQWQ16yVGls nOeOl78cnnqkaHxOGcq9SvMVx6hZGK5qoq7XA9YsxgAM0FChKQD7WpaHzaqNjkzdrE7B WMcpGDkoXGQGqMJ+qCF3gx0T5OfshtNkfDz68uQ/v1JMrfppbEZXbWQvbNrTMV9KZliY P/6zhY34kcfQM4MiITMc2GeiKR0+oATSI6eWdcgtjSY54l+Lop3zbQHFcDpCNSvSQbox Rzv8PCDsP9a7WYrICpneb+dIfFLrMpDN/mo7hoYYQ9vhIh2vGFGJTU77EiwIRy6W67NU 5Lng== 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=IqaLr6BFu6QU3p+4N0XxulwHFk6+V+czeiV89fAmciE=; b=NWVOgeeAsHz/jSSeAcfETkIkCCghDYClxJlwacPm+WBqqiIwspHZtJDQYmCgf9pI1c 6VTd0K09oPXJn+0lyydoTOAmj0pI8BaReU3we63e/GaKQDGrFOP7cNvKcuv+hw0zgtJd r/NFFUswVD8p3oxWjOxFytYQEUYFIblnoW/T4oAUqu0kwp4le+iy01Lz604laAT5r7wa d9wxF2zv+aSnotKEdKCRM9oX2c40kmT5b+ZHN94GsXYvAJN0dSg24MoDniPuTTsxT+L4 cBejeE4b+A1tSGa5MTeZodUXX3PyBy68x2JmQpqrC8k6kUN6wOv5IVkA2usSs8MOw149 xJow== X-Gm-Message-State: ACgBeo0xLIsTt/EenTE+2x7/MKR43pq4hn2EdISR8hTd2UlCyya8/NMP LIRkpN+mh5GGyzuFLTtMRpxfzi7Pxa3RDQS0 X-Received: by 2002:a05:600c:594:b0:3b4:7637:9444 with SMTP id o20-20020a05600c059400b003b476379444mr3804767wmd.52.1663171196400; Wed, 14 Sep 2022 08:59:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d10-20020a056000114a00b002253604bbefsm14290812wrx.75.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 1C45F1FFC1; 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 09/30] tests/docker: update and flatten debian-hppa-cross Date: Wed, 14 Sep 2022 16:59:29 +0100 Message-Id: <20220914155950.804707-10-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::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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-5-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-hppa-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 802e332205..6c1d765463 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -65,7 +65,6 @@ hexagon-cross-container: hppa-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-hppa-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c565aa5e7b..e39597d35c 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-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker index 3d6c65a3ef..af1c8403d8 100644 --- a/tests/docker/dockerfiles/debian-hppa-cross.docker +++ b/tests/docker/dockerfiles/debian-hppa-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-hppa-linux-gnu \ libc6-dev-hppa-cross