From patchwork Wed Sep 14 15:59:48 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: 605765 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp863873lth; Wed, 14 Sep 2022 09:41:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR4pgA4WpCBn//Dmp4QgAd0mgRv8VfCJFqmRSEmtH9PVvy/ShlOPTVzIXM/l8i/FOOB9FSvK X-Received: by 2002:a05:620a:2115:b0:6cd:ef64:b287 with SMTP id l21-20020a05620a211500b006cdef64b287mr16939899qkl.704.1663173666705; Wed, 14 Sep 2022 09:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173666; cv=none; d=google.com; s=arc-20160816; b=opEdVE+ii+rhoht0xnVqnRbipIJzAqtrgW5UK9xwYNyTzfFhrUNCm1iVCfKceWyt25 bTcgw2/otiXsL7uSunPWbJ0jFA5ugc1BILeVGleTF+niMXM+nbaLFvTSl5oHgcz50YFa CGs02I8Hv+1XnmlzNQZGPppPCXgtN35bvLDvW/5H36UdBUDRj4NYfzSIrofxugT6dJ9T heQ8pRHbng/FzJXnSF3D63OwUNMXwHOyCs+QQ80//8tO8KIGXsKQtjXeDsEP+EREhJQw ukVoIl/TyyMZJ5lty6Od7nR3p430ho91VHfd7wqNR0tNqejX2DDf4ZGQGnb0TfDvSy4x MxCw== 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=BzWKln5PytAzOwwrEI5gVpszKbRJrpWZUaBdq/kcO8c=; b=fmNs/mOhzJLY+cnxu5+LVi6A+X1hGIKANLhr3AgREqEeKB4z4d6MV00JujI6YeIT+1 EmkLzca+G2HnN4QTTz4gmyLYr9NoScFMyIUgI7WVCzphbFEaH2Klp2TNf4l3L2rCOIsy zRihAx1ik56Urqi416yGzViypFQ7uw92KNjTDbe8KJXbDb4Je1UjmrUS+bHRF45OpnG2 dPoD1c3dAvSBs9yWlc61Os7BDi8/kkWp7dg+CVF/Pp4B+LIViGVkRnZt2lDehDoJcEhr ry/tHwMPDa/b1DuxyyhLDRkRW7NEKbzrsEIvnWvriEUewhbWZGzyfblgPZO4ITyvyidM D8Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MZctr4eV; 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 cm19-20020a05622a251300b0035bb82b284asi1530830qtb.568.2022.09.14.09.41.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:41:06 -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=MZctr4eV; 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]:41330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVRi-0007hX-4s for patch@linaro.org; Wed, 14 Sep 2022 12:41:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu4-0001UU-1h for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:20 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUtz-0003rW-Ue for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:18 -0400 Received: by mail-wr1-x42a.google.com with SMTP id c11so26445906wrp.11 for ; Wed, 14 Sep 2022 09:06:15 -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=BzWKln5PytAzOwwrEI5gVpszKbRJrpWZUaBdq/kcO8c=; b=MZctr4eVrNq7SUz7KTP2/QjslavlATnJvXPYekQS48H21gnAbjJJFnHGT9/+mo3GvT rLSVu+IxiGKj9liKwKcHAOq63pX+Hekfp/GoZb1DiNLn0qkqH1LmXd9f870ci0sgAKCL JrXo4e+bHul9SlCp+u9eozxgyc7cA7EBdnS4J8eFaJzfe3+0/s11dlzrV7O0rA+YTexf aSratoqdt5H0voZnoWlAIQPBZQDy+E1dmqm6pKAYy3s3kTeBUKSswL/ajuF0nVvDCfxl 8F5UfHlgzVseuWdKNVyWAfxAkWM+J9m4ziGmGPixHWXU99oahJyKB8fW91X28O7hl1AM FK6w== 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=BzWKln5PytAzOwwrEI5gVpszKbRJrpWZUaBdq/kcO8c=; b=QtaFHwhBQMAjq6/DJ+PYCRXyWz8N/LMFJMMIcCQqUKq2aX4T4wiq+SFQhiBlsjcrFc fDWpevYVInFxjvHnvg7OQcuk1018XHntySSIKgZAksvZ9rMTXJDuU8B7WdF+pi3x7HDm 84XyyGNywRo1c2KT3yOJe7Pm0WFx05Xud9khrRSHNunusJK8mjzbqpXoT6fV9guRXx2h 1aA+ZcSIsIHdAZFYDXIxxwy4z3isdZweblzzZZXZa0ToATdBRf1zbp9ulQirTn9SDR3E 4ws2kH6NrwIBw7ntdjrxEpowq1EmiOFSyYRVest1LNMQumYv1qwZBnEOIgSXCVwU+88I n13g== X-Gm-Message-State: ACgBeo1k85QvFYSSVe5/Vvy8h9itsP+zUlqMxM6S+3i7HQqBbw2EyZD3 zczItK9Haoswld3mYmAIFv0KNCgx8UqIcdVf X-Received: by 2002:a5d:48c5:0:b0:225:2f99:430d with SMTP id p5-20020a5d48c5000000b002252f99430dmr23876985wrs.358.1663171574483; Wed, 14 Sep 2022 09:06:14 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b15-20020adfe30f000000b0021e6c52c921sm16874931wrj.54.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E86521FFD2; 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 28/30] tests/docker: update and flatten debian-toolchain Date: Wed, 14 Sep 2022 16:59:48 +0100 Message-Id: <20220914155950.804707-29-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::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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 Message-Id: <20220826172128.353798-23-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- 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