From patchwork Fri Aug 26 17:21:25 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: 600305 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp563966mae; Fri, 26 Aug 2022 10:42:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR5BcnknFTrUac5NJ+ruuKu8ZnZjyLwKGDrRaCDLfzf/ifknG/uNyu+FelL5GrIgXHsCgk4H X-Received: by 2002:a05:620a:44cd:b0:6ae:ed7a:b058 with SMTP id y13-20020a05620a44cd00b006aeed7ab058mr563029qkp.533.1661535731259; Fri, 26 Aug 2022 10:42:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661535731; cv=none; d=google.com; s=arc-20160816; b=vUQ5C9DQBbcYShMD1eEarFdKyucqYG/RPzt+gRoKLCqW5FPN+++X1XL/tgbSOXcmD3 MLzl83Yobn8RBK8VfXR9Be5tHCAbjX99S47Ae+e3bXTjw3DBxXVZPjEGxao5ZFSnHkKi qnoXGl0IFnevJGFquMON4kIeCcmfLUy5xGXidOBa4D9oSJpZYPi/hjqcH8Jr3PUblNVg 1K6E04+hmOoL3RfkE2EG/k0te/30mjxgecwrTGOyhQGAZKjsqkjRHCx20g2LTE+j0rgt lTwuPtaYg/511MaeI9oe2h9QOpBbUoI7xgmIB3hLPR91tVg0ydHYg5Rlx3wZuwwcbDvV Lp7g== 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=+BX6qUyxqbnrBehmpeRa0CPGjkQBlNLSFXh4p4mNIT0=; b=ccXBGFAntz0o1Mr3Wk1MG3lRs2w14eaufa+rDyl5bPN9HOh3j6LK+gRdCxAdHJCTnE ejU/Stp/psj3gKHsKL2F5c4EK/ZH3bOIu61k/uz+oGRT5dhmW5RAvSXTQ4zEDmEM6wj1 3ZJbZejTcp2fsIF2IiUDIS51Ze321RC35bnvTUXEBXvDK3q4fp9r9ty06NOdw8hAMuYG EcLD1lfZndrEKQWoHYGglABXcSXqhoc+tWYsra2Qra0FcsBR35QO2wGzCd6P1yftLjJd aekvYVwsb8+/T7vLQGeXJmVF4kwO82Qn+wnGmBSfHz/y3gtP6oNMkO4NsaKo5ovAcqlc bRKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="IpbHM/cC"; 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 g5-20020ac87f45000000b00344add8aad6si258643qtk.146.2022.08.26.10.42.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Aug 2022 10:42:11 -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="IpbHM/cC"; 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]:39570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRdLO-0006sq-Oe for patch@linaro.org; Fri, 26 Aug 2022 13:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRd9y-0005iG-U5 for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:30:22 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:35341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oRd9w-0003i4-Tq for qemu-devel@nongnu.org; Fri, 26 Aug 2022 13:30:22 -0400 Received: by mail-wm1-x32d.google.com with SMTP id m17-20020a7bce11000000b003a5bedec07bso4785292wmc.0 for ; Fri, 26 Aug 2022 10:30:20 -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=+BX6qUyxqbnrBehmpeRa0CPGjkQBlNLSFXh4p4mNIT0=; b=IpbHM/cCxx0AUhvFfoP0kEPevtsEvmj6ObYig3NbtQ9+DcJT4Hd2TOHPtlKxF8/taS NjheyMDzSHiPZEw6V4Sv48wQowcY2ODsKFq7JLgapi/PmABlCADIEhECduXfU1oisqMU 3euxc1kgADhwdWzPEozoeFY9rmWJ7+bNjDoiWVerjrAAI9s5xMKzOS/I2FkFMBLk/Cci Z2X1H5CvR8BzC+IMrpUx/SaYrzCWxfJzW11ArZnNGUAZk4rzLZ804M672yIpExCspVxx kjE4Bnm8r27nZIr3HM6y1eSTuyw3ArlMP1OiPj9Awd+Mvaem8o38+bLFLXTWeby9jJo1 F+0Q== 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=+BX6qUyxqbnrBehmpeRa0CPGjkQBlNLSFXh4p4mNIT0=; b=hUHJ9NXxuVVVT3+zs2nkihEiHT7NSDsRziP8+0+PM+lxObtVqvSfNXqPRnw19O8qr5 1fUllMB+5MqKKE5b2MdNhjk7t+6Ho4zux6kt43NOMv4KsCk6VFRn/J3OKMJl4/Gl+tc8 ZQwf+3r3iuxKwPMyFdZmZF13sYMwK3/q1+YPITuul5Si2uo3tWKo5dQgZmSZK6rDn+g+ OeNKR8YXzRn+d2AU34VQeJNsMn0rqUPbjE+KrFuK3sBUyQ+eYyUCG33D4zU7jBie1lBl +dI5fG6NKDNPUoIlOn+gPYPwyZhgG/gCksFETHcriOzZLEr5H4Wi0LLlsceJ0zmOAuZr hC5g== X-Gm-Message-State: ACgBeo2uQR2JCqS1fEk6+O7bp5w9Ufap/ZOLqwOCM0pddXh8gzjPKRit jfwBCmJ4fnT2KtBDB4kJa75KpA== X-Received: by 2002:a05:600c:28cd:b0:3a5:4f45:b927 with SMTP id h13-20020a05600c28cd00b003a54f45b927mr358971wmd.90.1661535019390; Fri, 26 Aug 2022 10:30:19 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m4-20020a05600c3b0400b003a531c7aa66sm336383wms.1.2022.08.26.10.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Aug 2022 10:30:17 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AAD991FFCC; 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 22/25] tests/docker: update and flatten debian-toolchain Date: Fri, 26 Aug 2022 18:21:25 +0100 Message-Id: <20220826172128.353798-23-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::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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 as we do not need anything from the base image to build the toolchain. This is used to build both the nios and microblaze toolchains. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/docker/Makefile.include | 4 ---- tests/docker/dockerfiles/debian-toolchain.docker | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1d5a6f1fb4..a3174346da 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -127,10 +127,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(DOCKER_FILES_DIR)/debian-nios2-cross.d/build-toolchain.sh $(call debian-toolchain, $@) -# Specialist build images, sometimes very limited tools -docker-image-debian-microblaze-cross: docker-image-debian10 -docker-image-debian-nios2-cross: docker-image-debian10 - # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index 738d808aa6..c723377495 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -4,7 +4,7 @@ # This dockerfile is used for building a cross-compiler toolchain. # The script for building the toolchain is supplied via extra-files. # -FROM qemu/debian10 +FROM docker.io/library/debian:bullseye-slim # Install build utilities for building gcc and glibc. # ??? The build-dep isn't working, missing a number of @@ -15,6 +15,7 @@ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ + ca-certificates \ flex \ gawk \ libmpc-dev \ @@ -32,5 +33,5 @@ RUN cd /root && ./build-toolchain.sh # Throw away the extra toolchain build deps, the downloaded source, # and the build trees by restoring the original debian10 image, # then copying the built toolchain from stage 0. -FROM qemu/debian10 +FROM docker.io/library/debian:bullseye-slim COPY --from=0 /usr/local /usr/local