From patchwork Wed Sep 14 15:59:46 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: 605768 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp865847lth; Wed, 14 Sep 2022 09:44:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR76kbf9tMvjeNxmMPle90ky1wHBJ2tC7MNzQD5c4M8jpXKM2ly+SIW8tSRmEDPx2y7xHgLt X-Received: by 2002:a05:622a:5ce:b0:35c:b73b:59f5 with SMTP id d14-20020a05622a05ce00b0035cb73b59f5mr6352132qtb.541.1663173890894; Wed, 14 Sep 2022 09:44:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173890; cv=none; d=google.com; s=arc-20160816; b=C97DLsDqFOKCmx4l1813jVhKXrAUuR2XH19qzjsKNl9KrjhdUf9Bd6s+xH+OcFE8Ha hFWlg8jxzzE3MCy0PqcpG3n+cJKkyjRbAva9AwtF6f0M2mkmvQSWQJ57EQn1axVmXwV6 tbWGtxdkAHsl2kCYbQ/AQx43WGjiWlcsFWV6EmJpSoLJ3fI7MIVPLfcXxcZFGDhZOk8O tfZuvjKi1QtpnJx9x+nOeB9Klp3ESFpO0MUMsK9kfByxzCY9GK+X1taum0k28ufDsnAt aqCctNC+e9F2AMtbX4le10d0tUJX1LqoiFvwHfKC8C9wpEv7XVT4FNK660+Ph0ffMmYZ WNew== 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=3C+bQmjL1wvLGpweQJ8MbVcrOXpM16i/PFvvqaa7Mdk=; b=nuWuLNtlkTrNzQUeqoF1wp8W3lxi5rypmrIDsqQTTWDbMBWWwc65JReyricBBBQDKB xGUlkGpFciPnJMJGg9XISwVOxAYrwM6DJ00xUxmbFKMf/fFf5U5uL9pPPhgOFQpgFkaa 8Q0TX6s1ZjjXHBaf7G0u2a+e9/8tXyw4cgEooD6SjinL28KO98wy+w+hFf2ZhGVvCmNc ga7mMpLBJ1k6O5Q5LaS8c7ZAU/D49VNAKFSJ19j3xsQbtElf4J2lxMlXSmhZy0tb9G16 j9QqnO9AGApEdejmsm0NXPuXHUVoBtPTLXPoiUsNVwEulX11P+RkWTg0Eo6JUd+oBqjh thgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GZnXILYS; 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 z11-20020a05622a124b00b0035cb953186fsi1446762qtx.423.2022.09.14.09.44.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:44:50 -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=GZnXILYS; 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]:59058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVVJ-0004Cb-0o for patch@linaro.org; Wed, 14 Sep 2022 12:44:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu1-0001Sc-Ow for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:19 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUty-0003r1-Ft for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:16 -0400 Received: by mail-wr1-x430.google.com with SMTP id cc5so16625989wrb.6 for ; Wed, 14 Sep 2022 09:06:14 -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=3C+bQmjL1wvLGpweQJ8MbVcrOXpM16i/PFvvqaa7Mdk=; b=GZnXILYSVnHBWlvYtIjiTfDOVlv6LEoA6ErLaL9QDKH23GcxisWCLbYq7xYGLlR+4r zfglzjcir78pjU/oN8hE3SL+EdYZ5vJSAAyIefSMKCO6Ol2tgYjrYt/ZNLBIBVgiANXN xSAEOuxBZSkHTuS+YN+T46v3MVK4A9h8pkST1qtAYCz6vQCVjUiQUcK4rtnbkQ9UaJBA VWScw+w9XMUMI9jGu/GkZexHHA+RgsDfksKZY+OhTnvL9wng7NrIxYlUv2Fl42BEKZ58 AhG5vWVbldYA3QJPe2U1jqJ36ttBK0dQPjuJqZY6e8tYi3ziSgu1Q6aHJSjVL1frtumX /iNw== 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=3C+bQmjL1wvLGpweQJ8MbVcrOXpM16i/PFvvqaa7Mdk=; b=RkGvq5Cw3bWqGJbSc/Fg+E0LvKnPDPEKe7RebdGYEKYh7boQtab3cZRbANH+74pMA2 OCPClkivcky0NTf/5OOy75u3mLTwEWw4qujNDAXXq8oNMMdGzMuOmRZTemDpuoKQJivB lJE98RzCrAZh5a6OFtK/+wEW0aPpYp+3d0ZJ3D2j+ANS+bP2s1q9CpW1DBEhhdyU0sUH z7Y3TAgCtlRQ8HDha9vZdR/RX+f7DCVGAIFRtoNhmpXJ2L6LmW8PT+KQ3ktqrG+RAdAb KqbMalaBu1eMgfTAjDiO6sIHgS9SueV5NxWPfd6FnQv7uepaXaKxmNrAs28HNJVe/UuN kFKg== X-Gm-Message-State: ACgBeo04vBhjLJge5jW09CgNeacovBVmQEnvkrK+CNDdwOUBQspS83AH KaqrrFvxI79Zi2FhczOxmv+WwoL1OHMBl27x X-Received: by 2002:a5d:4534:0:b0:228:a411:1145 with SMTP id j20-20020a5d4534000000b00228a4111145mr20915268wra.222.1663171572657; Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m3-20020adfe0c3000000b00228d6bc8450sm16585300wri.108.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B65471FFBA; Wed, 14 Sep 2022 16:59:52 +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 26/30] tests/docker: update and flatten debian-loongarch-cross Date: Wed, 14 Sep 2022 16:59:46 +0100 Message-Id: <20220914155950.804707-27-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::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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 Message-Id: <20220826172128.353798-21-alex.bennee@linaro.org> --- v2 - use debian:11-slim for consistency with the others --- 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..df578da40d 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:11-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 && \