From patchwork Sat Oct 28 10:33:07 2023 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: 738932 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp301414wrt; Sat, 28 Oct 2023 03:35:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFucvbrgAoFJxPgynU4xy/l2FBy40LUazWyM+GRLLyN8ZNbYOTDUQazx/PtUux/2Xw548ZA X-Received: by 2002:a05:620a:8d02:b0:774:a9b:d62e with SMTP id rb2-20020a05620a8d0200b007740a9bd62emr4467266qkn.46.1698489313590; Sat, 28 Oct 2023 03:35:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698489313; cv=none; d=google.com; s=arc-20160816; b=iQ/JZGgwmj5rpo0TQaVu3O/lXAS+F6l4Q7pUqhVce56HCunrViwmQplrTmegLmdlbq PRfAOHez74dJFC0kDz9ZNcRzaYPN8Zhic5sxgm8F7HNIWb/GirTj0oc1iTAAcToVO3uG LnNSCBbf+w4wepHyHNUPD4LR7pW4WjSJ2oG4Dlstpgb/9EpJDaxfjCFdvTW1gxutMxQg 2LYFOcsVt/DGp5ohsZ8a+7XrnYHzsJmbLhIiLYvlHtRV0fwB7weWezLLjxcFXY+ojq/v aH5foFXNHiWErp+F9rSh4uWJeFBrPc+Lqjm5r/8nOCw9G+zqq3p3OrxsrcGuKXDJX3D9 MjHQ== 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=VBUDJb1FmN0uo5F4PjILA3VIdrQLeL6tJBLzek5+1QM=; fh=Li0NIah2CDds17dcf3NMv/o5ja0S+f9u+iV0vQ5eMRg=; b=0sTvI0h4pZ8I3gQT2fgvUst7V8dXuJ+QTcvdSddPGDCvdoiIVyBBAl9o1CNxaN+qq7 oeEXAgMJGJ2IqCQlh7cmowqRbaxbgZkohg4dqg77TGlQjVk8sCcOwdtgqQe6sdqYGtw4 iQGH0qGIEL5ntKKAg01GfvgtqpplL5U3DpLQUeQ7Z6neNrwEKKX9REsk7VNmk+JrGo9O LihKd+UfFaF4kyG4JYzh0j77t9vHp/tphQbGt+wT5hfvKux7Iig2mMyEzr/Gaf2NX5Oi 0x65XGIsNcUAXxoNEpf/Ne7dlevHXuizak9jpOsxqR7bA/XGGS7EuZR0/MWNY3J8oZp/ ZsoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=soGQZHZj; 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 o21-20020a05620a2a1500b007758e5dba49si2105703qkp.61.2023.10.28.03.35.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 28 Oct 2023 03:35:13 -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=soGQZHZj; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwgdT-0006On-M4; Sat, 28 Oct 2023 06:33:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qwgdQ-0006Nk-Lc for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:40 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwgd6-0003AL-HE for qemu-devel@nongnu.org; Sat, 28 Oct 2023 06:33:40 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40906fc54fdso22574445e9.0 for ; Sat, 28 Oct 2023 03:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698489199; x=1699093999; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VBUDJb1FmN0uo5F4PjILA3VIdrQLeL6tJBLzek5+1QM=; b=soGQZHZj32t9DbXoJIF3AmFSaXX1Mj6s06yBKaXobkC8rqWcfyNljka1Lj73PSppRc M73eulFIP66BeOIfZ3VtwN7oS4ycjhZF61YaO7Jex2DNfuL4fkcAL5w+DBYTHdlWdndD XrNxRbifB5T4Bd5Djx/zGxpnMecGWFIVW2ChNJqq9lZ340TvR3HJ77fv/OuEN1Zre0xP BYz41MAWb5xf346QY9yz1WnwW4vvPMKB8w/1LAnOpXwW8YCU/r+Xnb2gVSq5smEBq/i/ 3KZwtueh1iqEVFE3OAeS6qelxDiJZrsKAgFWpRwm+UQ4bTA06avMs6x9gZsojETRAdQi Ozqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698489199; x=1699093999; 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:message-id:reply-to; bh=VBUDJb1FmN0uo5F4PjILA3VIdrQLeL6tJBLzek5+1QM=; b=Z7qwWn8OEct0HDrDEZX/ammj5KPl5LtEMvVgW2qTQRYnKvZw79+Q4+zgKE0COxGz67 Yt0i5nm5L5zjJZytO3dZPZSZZbrsj+mpwHxlw11TxAyyYxF5+WZJjm6KemzrWkCpJCsC GAnGz0o/4cqRiOR3LyvVSoTk/Wgjm8wLgOPDzgZmmdxHKDRwxcV4CcyQ+n2SU8IIwwaY fby5f3b9NcabPEK5jXMRF55M08Q8Zq0a06KvHGPTfzdI1jfXI+mQeQxO+QNQ5pCpxb0Z EynEiB/Ebagoo3tZVhSPC4SrxRDHudqUqnChT4ST0vboQ83qVmYJr78VB9+zmUYZuic6 +6cg== X-Gm-Message-State: AOJu0Yx2Zb4Wl55hcmxQBHUuW1UMpJ68reU3XUPgj/KtJVlCU4j1LbQv 8XQyoHlos7PMLwaTVCCDp7kVRg== X-Received: by 2002:a05:600c:45c4:b0:405:40ab:7693 with SMTP id s4-20020a05600c45c400b0040540ab7693mr4428638wmo.31.1698489199128; Sat, 28 Oct 2023 03:33:19 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 26-20020a05600c021a00b0040813e14b49sm7176737wmi.30.2023.10.28.03.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 03:33:18 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 4FD735F7A3; Sat, 28 Oct 2023 11:33:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Beraldo Leal , Mahmoud Mandour , Brian Cain , Paolo Bonzini , Warner Losh , Eduardo Habkost , Alexandre Iooss , "Edgar E. Iglesias" , Kyle Evans , qemu-arm@nongnu.org, Aleksandar Rikalo , Aurelien Jarno , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Richard Henderson , Wainer dos Santos Moschetta , Peter Maydell , Brad Smith , Jiaxun Yang , Thomas Huth Subject: [PATCH 13/17] tests/docker: upgrade debian-all-test-cross to bookworm Date: Sat, 28 Oct 2023 11:33:07 +0100 Message-Id: <20231028103311.347104-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231028103311.347104-1-alex.bennee@linaro.org> References: <20231028103311.347104-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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=unavailable 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-bounces+patch=linaro.org@nongnu.org This requires a few more tweaks than usual as: - the default sources format has changed - bring in python3-tomli from the repos - split base install from cross compilers - also include libclang-rt-dev for sanitiser builds Signed-off-by: Alex Bennée Acked-by: Richard Henderson --- .../dockerfiles/debian-all-test-cross.docker | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 43cc083318..2cc7a24d4d 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -6,10 +6,10 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM docker.io/library/debian:11-slim +FROM docker.io/library/debian:12-slim # Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +RUN sed -in "s/Types: deb/Types: deb deb-src/g" /etc/apt/sources.list.d/debian.sources RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -25,7 +25,16 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ clang \ flex \ git \ + libclang-rt-dev \ ninja-build \ + python3-pip \ + python3-setuptools \ + python3-tomli \ + python3-venv \ + python3-wheel + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-arm-linux-gnueabihf \ @@ -53,13 +62,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ gcc-s390x-linux-gnu \ libc6-dev-s390x-cross \ gcc-sparc64-linux-gnu \ - libc6-dev-sparc64-cross \ - python3-pip \ - python3-setuptools \ - python3-venv \ - python3-wheel + libc6-dev-sparc64-cross -RUN /usr/bin/pip3 install tomli ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sparc64-linux-user