From patchwork Tue Sep 20 17:15: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: 607653 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2051829pvb; Tue, 20 Sep 2022 15:12:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM63dKdGJHi+rHzGT03WlvV/S+MAkC8QyCRSKqY7eP8PIrqHR5afx+TLlcBpzM+r4UVzFfwt X-Received: by 2002:a05:6214:daf:b0:49f:5ce8:e628 with SMTP id h15-20020a0562140daf00b0049f5ce8e628mr20791341qvh.115.1663711945522; Tue, 20 Sep 2022 15:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663711945; cv=none; d=google.com; s=arc-20160816; b=aeFOrUGBPOO7J796uu5Wk7w0Rig05rP3OjJ7jFOqOVheTUt+24Baat9UkKTqwpj5hM CurmCggcUGwZ38Lp0TkeJSb/vk3WCm80c78TcBmjBs2uyuedmVkq5aFs8YK7vZc2I0xu h86xWu0v5uVrhZmpp8RSCkA4Pbwejvf+BnvadM/Gpu+soYfOAb53aRU96Src+iFXuClb 0heJ0baDz5w6JxJDhFgL+kV7N0CDtbwKu4jPafJFJCqhpQckAnqfgQSnuHRHiYafbzeN tvE5Isn8bN33X9qp4bcrmgmbpuMV3g8equRmE2ud72Reum39VhBTgtNyluKQFAGa8IGU fheA== 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=uWDiF1jWgciTeV2Qg8CZ4j2xTGM9MuFQveZ8m5IhBP0=; b=eYxW1jtpyx/x/cQ2AVATyDSl+njB5oP733+HC9GLBMxFFNnUKmPoTDZkx0polhZxuO qRTYZg7iNA91k5W1/qNoY4ypsshcelrOyeNFE273T7B2cWYLUNAjW9GbV67nKMBhua3w OC/Ds2QLIIHAKxERUM0YjiG18UdGqkuRP+Zzgk4i/Mzh9V9xlNgxa+mBfsTKEW9XImW9 ceTuR2ZOiwypWelCvAG3Cd/G8uZjejj72WcGej5Z/Bjfb3m6OniHszQRBLYXvmr/BI6W K1zbSeIdrIaISYrYJZKPDjGAAlr4fBtHP2iwaMTV8Rf/qnXAxU5I3g/Ee/D8UZojao3/ +iAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pP4CILQr; 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 ey12-20020a0562140b6c00b004952caaebb2si640005qvb.174.2022.09.20.15.12.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:12:25 -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=pP4CILQr; 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]:48022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalTd-000236-0B for patch@linaro.org; Tue, 20 Sep 2022 18:12:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagze-00065s-Pk for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:10 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:41741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzd-00020o-3M for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:10 -0400 Received: by mail-ed1-x52c.google.com with SMTP id z97so4843596ede.8 for ; Tue, 20 Sep 2022 10:25:08 -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=uWDiF1jWgciTeV2Qg8CZ4j2xTGM9MuFQveZ8m5IhBP0=; b=pP4CILQrgbH4zok1CZ7EWVql/NlX8q/s2f559164fUK7rBw0vHbaDluXuegSvvHN82 WqizcRsdhKRKXabMnZ+V6XOnSSJ2lxNKnMSId0LDLC3gDqMkfFmGRJl+SQPBx+mypjxk l3lrj17AHvp3VhRFNP7XK4W+ZTSCUzy9cEKfkU/rtkk5AvYjA69cl3/sbpVmngefSvkr 3tsfsnrMHeKsLidzyGAtjLGPnR6JpawHUThFxLsycBWxYsLVnlVG7WIO07scoKYbzVfz jTVjv7YC5n7+EIiLucfifA9M8/cz7V31w+hmqKWjaLRVjs8Vs23Y5nPKCcBiNvyfsyAR UceQ== 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=uWDiF1jWgciTeV2Qg8CZ4j2xTGM9MuFQveZ8m5IhBP0=; b=KbO/t939m7m16bwDl39dFlhV3Kc/EKSk7J7xnnjrOm+hPrTiOGAOQxIXN+MHNJ2cC1 pA1QvSWEuj6kDtpff6M7Uv2sa+YjMrErpRwTU/W/vX2zcm/g4fT/sMyu1Wm6EkgySE4p gOC/Sx2iRBs0Djo3CQ8zH/WJUo5+lRGysl7lyQmqxyDlmp/x9rcfwt1WnGH0Kz1B/2FK pYVjO9ie7tRjsBk+JAznq8Br0xNvMSD8ajCXLlFSClQx4fxzMx3+CWQgF3qBzYlfEl2H iFT5TNRojomaysCfb0DRuBomndJmyMgx93jppNltAswp4i9nQg274kVoTeWdQlaabAkY rS/Q== X-Gm-Message-State: ACrzQf3dNV+8myKmISqiD8FspufKFnGpji97yFwPOqWTjn7/fkeZ2ndE 2nn6yd26jV07z9alKuJ28an1vQ== X-Received: by 2002:a05:6402:35cb:b0:451:6a0a:6688 with SMTP id z11-20020a05640235cb00b004516a0a6688mr21251120edc.415.1663694707648; Tue, 20 Sep 2022 10:25:07 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d22-20020a1709061f5600b0077b2b0563f4sm143721ejk.173.2022.09.20.10.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:25:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 83CCE1FFD1; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 26/30] tests/docker: update and flatten debian-loongarch-cross Date: Tue, 20 Sep 2022 18:15:29 +0100 Message-Id: <20220920171533.1098094-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.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 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: <20220914155950.804707-27-alex.bennee@linaro.org> 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..a8e8e98909 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -1,11 +1,13 @@ # # Docker cross-compiler target # -# This docker target builds on the debian11 base image, -# using a prebuilt toolchains for LoongArch64 from: +# This docker target uses 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 && \