From patchwork Fri Aug 26 17:21:09 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: 600290 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp555668mae; Fri, 26 Aug 2022 10:25:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR7G0tPFbuTHg5JR3BGWTLi+tH53ZlEfC/ds74M3L/EbmZCG4Y8J0S71rp9Rg8mUpTjerK9W X-Received: by 2002:ad4:55c1:0:b0:496:be28:7a85 with SMTP id bt1-20020ad455c1000000b00496be287a85mr578693qvb.9.1661534719185; Fri, 26 Aug 2022 10:25:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661534719; cv=none; d=google.com; s=arc-20160816; b=haM4PFTnt8e/3EWFmijjbdoezPOYWngiDMlRQuU6uyIwSvNdtGcdzlO7nb8Ad5/IcM Yv+fQqXdcNfQHK0o8P3L2tEFScF1JaV5XMhf9x4NS6b4LqxXN6AV1czmNS3RboQrXQfL 5eLOdIGec/yNBcur+IAeItwSVyN6gmpo9tNTl0l3+IWn9CMASf4cifZ79Te5hKWlAsHy YwKCVUptmzkub+ZxqNe3WAVMBZQPcqPYE2I1qrAxsWwkvjccjMnwd8DIfDU4pEt2Jp8U hC1w7ZBO48NjOaHVBKvAnyODpR2vMNWxufMeU/Hm5SR8o8rehV3Z1zim/B5akfunovAK tYJw== 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=2yNc8usUqo6Q33AsamNux4gFM4GyK/SLmXIzDRoATm8=; b=aVuSgjT7VOfuQ5kyyEbQP5HEQSwLrZQI6YneBBjRFLFpeRA1Hd/P55g60z9WfAlZkM 3aryMqSH8fogTFZZsynUKk0YOaQwHe9A+oKk4r0cpRS1gJSVd1z4rs+bMG0RSz0yU80P peQRlTHdvc/nTcB4jpIzTRCZ+XWVwWab1c5rjVXy1QPBY+AusFS6yIlJbyYkzZctgg2u MNFHzcxpWDZoa8LwexVg/6nmgYTrKOLLtlsoMupzgTE362nCEDVsVTltglvrIY9Ejm9K cw9L4ILM9GP1u6O1kM6QTUv+3cJEnCjyBrl31iYF2PWCqcE5CoiGLnjzAJgf1NBJt1rd J6Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DawtFSk8; 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 fb6-20020a05622a480600b0031ef6d577cdsi226430qtb.190.2022.08.26.10.25.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:25:19 -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=DawtFSk8; 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]:59546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRd54-0001eF-Od for patch@linaro.org; Fri, 26 Aug 2022 13:25:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRd1W-0004Gg-4P for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:38 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:45827) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRd1U-0002KV-Ct for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:21:37 -0400 Received: by mail-wr1-x435.google.com with SMTP id bq11so2536362wrb.12 for ; Fri, 26 Aug 2022 10:21:34 -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; bh=2yNc8usUqo6Q33AsamNux4gFM4GyK/SLmXIzDRoATm8=; b=DawtFSk8iZqOkQIjcOg6JxJieHoWOu2AkXfkq3RTvOYOLFcFXhWjsBd+qEdHrrlgbN FxSxHoEvm8ZSMFO3vcxJP4t2JI7BdkPeJF7H4UE7/fxoGO1vUl43zWol/Ij0JvNrH0MO bUGA0I6QLcyWDOz0+1HuuFmOXyK3B+1SCQCJZDNorXTXlS55tSj3eF7yWaAIMceUIyBZ +jkSVZ/OjTW/E6/kqZd94FaX5lA9ybz9F2HuzEmY2xx86Wk7m33yI3wfQT5J8KqDzXaw AdlATQ0w3c0kQmIB1mIv3ikwOTjFt6p/GEpiOln+H5nROERjo1RoTqbJdYio7EUpgnrw Mgwg== 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; bh=2yNc8usUqo6Q33AsamNux4gFM4GyK/SLmXIzDRoATm8=; b=vJTjfhdBPpRtbXGztrm8FGijYv1J8a8ErGBHdeEoa9ixeTW15zAXp0U+wmk99YTB9S g59wsi70+mvfMAEVMuHKKQnPMSFoqtw8ryKya2Oz8zXOKI3IGZTwZOOKfTBl/h0NIsPB +eQu8ghKNHOzXcSvtPfo9JYORr/9gXkoVpU/vaGfij6P7+omWnBVYyyjYrbJKkDGLEIL VVP36uvWzkNyG5GjtPCNfvD1WhlEMkjg78TLyahSOdUzV4nJIuCUp1E/KAzdd4pQjeqo SRHWaJUPr+o0Dx+i5BosgyQYdd7aaXb6vhBddYU1zdQ0to2Yk5/lb8RxC69pa/ueC4ZX Aweg== X-Gm-Message-State: ACgBeo1Rh+HRCtkCXgPyabgZXgi4PQQrZmljp5N2vcWzrF+Cy5SorIAS sXu5l0I+JklGoZjEyZ9VQl4D0g== X-Received: by 2002:a05:6000:18a2:b0:221:7db8:de02 with SMTP id b2-20020a05600018a200b002217db8de02mr396814wri.132.1661534493948; Fri, 26 Aug 2022 10:21:33 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u6-20020a5d4346000000b0020fff0ea0a3sm213123wrr.116.2022.08.26.10.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:21:31 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3E6811FFBE; Fri, 26 Aug 2022 18:21:29 +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 v1 06/25] tests/docker: update and flatten debian-mips64-cross Date: Fri, 26 Aug 2022 18:21:09 +0100 Message-Id: <20220826172128.353798-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220826172128.353798-1-alex.bennee@linaro.org> References: <20220826172128.353798-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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 --- .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