From patchwork Fri Aug 26 17:21:23 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: 600306 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp566039mae; Fri, 26 Aug 2022 10:46:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR53Ubd6kDC5TmmwRShV4tdhxQrZ84OTQXX+nl50uhFmcvvN+Fb0rQFOKfKAogMu2t94ZUrB X-Received: by 2002:a05:622a:1a86:b0:344:5f6b:e996 with SMTP id s6-20020a05622a1a8600b003445f6be996mr710113qtc.401.1661536001494; Fri, 26 Aug 2022 10:46:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661536001; cv=none; d=google.com; s=arc-20160816; b=WICN9yGmXF4r8WBfwhi+y+/RMP+V1JN+HcMVTlw0qavi8ibpFPhZzlce/I1v91eAmA 5d8uLpZooWlcvIF8Hec4DKEOlnKKx23BHabe5TOSwVHk7IyZzH+K+NRv6V/jBsIp2vq4 FBGkk1fWarTU5bIlqIfzwJPXrqWxQsQMThNdlFEcQ+j3Qkm/nXi0rJXkvrF3je/H7MvZ LvwerZQ+rfPfYLArqkhAXyF9633A1ZL6YDlDSuHWSh0E8BLjYdf5QXV6r01m+wzeIJto YEZ761aFXT5FtPuGFNCg+NxCvBSjZ6qfQMVLXfptRaOS9OpXIlRUjU7IpKQ2jNCYxZ2x NweQ== 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=AcIhrnEo/jsi7L6ojahvmIlXYQW4m/medhgo10JCLYM=; b=EnBqy3wDWscCPvfW27AGQflnyqeVdQrzzCy9CzRiM+/cZFm5W1UWqK+2bccqYSqFdE 3vMP4IDA6UDXzvhw850m/qVSs2xLtoWD+Y8SxOFbvPJR2H7wiYLttoEqATZRRiJktHSL 7cxaG+fiSIkjwUerp+gEXKUwN8Nh135T3V0tvGIT08RRZn9ZS0tGig6Ep/dtevzA66c1 kVDtVT+1EZIK3rNQc1QmER4TJCSQ+hl8QPMARsfKWFrDGA49nYIqz1hAeKC5kBBa9Y2q V6TQzgXMhETeiP3WLz28sLIJplywwz/b5UEkWiWssvFyaHa5OEr/ELMSLHp9w8Nm5JBF 4UZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hBsh+uMG; 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 cc5-20020a05622a410500b0031898a8698dsi200608qtb.534.2022.08.26.10.46.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:46:41 -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=hBsh+uMG; 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]:51040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRdPl-0004eV-32 for patch@linaro.org; Fri, 26 Aug 2022 13:46:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRdA2-0005qx-2g for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:30:26 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:40861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRdA0-0003lx-8L for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:30:25 -0400 Received: by mail-wm1-x332.google.com with SMTP id h204-20020a1c21d5000000b003a5b467c3abso4762088wmh.5 for ; Fri, 26 Aug 2022 10:30:23 -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=AcIhrnEo/jsi7L6ojahvmIlXYQW4m/medhgo10JCLYM=; b=hBsh+uMG2awt53suNTQBupj6o7GGMVxEWNu3Q2PDG9XMUuY/F/LBw/OVV7xmp6GTN1 z0YWIgLhGU0WTM2poOYhDd2dPz+N1BzrLgYvyMduxyiFJKpIdv59Sfe4Q3vZ3pBtrEbb +2j2vJY5o79Yt4ieG9izeS/mpgXLqUG2PXV7rsPze/rGJsv21IMaw2uk+kXNKajlL+po RPwB0G/aC8SUqHJ7ocBIX/7q/lPNfuzYhgQ3tRojyw4plJ9Y1423OM8kQ8O5dxTEnvWS XrGe/ncbSXLjr1QXbQTPsaFk8JPRup/ISqjb2vUtzxdbEDRkl7zQ+z3z7OEnjfhn1I0G JXkg== 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=AcIhrnEo/jsi7L6ojahvmIlXYQW4m/medhgo10JCLYM=; b=0qaS2FFWgJrXaGG9gPxsgbahZmrOHCcRDVatTtnGTK/wVUtnKuaxVO1sGTBwFHjB+c 2emx2JwmctIPm0AQPovAglFvibfueVVlaafnBqMIReiGRxAx0tI2D6k2G3qOYmWAUD71 yricibwJKvHNIiG2rOhImnbF4vt/wre51Z17Nhmn4r2TKAYmu46nipm8ktMt+AB1Ow59 1i4VrcFTcuTFoa4rTs8ZgAKZbBE/hxgsq7KxDGbB3uFsMs8wIJSMw3WWd5ISWx0KmVyO 9ZwFIyR0aMk3JF9GxOx2tu1FlHiUxjWGnvyffWjt2jk2Ic1oRrGO0bvtFNDd6t+C7DwT PIGA== X-Gm-Message-State: ACgBeo307BxTfr1blR741r9NNZ0ml4ipueDCupIrdf53yZPEPjaqKSfZ M380q+MP3OnWYQBpiYq1qqzK5Q== X-Received: by 2002:a7b:c851:0:b0:3a5:f211:45cd with SMTP id c17-20020a7bc851000000b003a5f21145cdmr411618wml.156.1661535022688; Fri, 26 Aug 2022 10:30:22 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g2-20020a5d4882000000b002254880c049sm292112wrq.31.2022.08.26.10.30.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:30:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 83F6A1FFCA; Fri, 26 Aug 2022 18:21:30 +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 20/25] tests/docker: update and flatten debian-loongarch-cross Date: Fri, 26 Aug 2022 18:21:23 +0100 Message-Id: <20220826172128.353798-21-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::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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. In this case it is a binary distribution of the toolchain anyway. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-loongarch-cross.docker | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a0f5109628..1d5a6f1fb4 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -128,7 +128,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index ca2469d2a8..48fe64c51b 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -5,7 +5,10 @@ # using a prebuilt toolchains for LoongArch64 from: # https://github.com/loongson/build-tools/releases # -FROM qemu/debian11 +FROM docker.io/library/debian:bullseye-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \