From patchwork Sun Oct 29 14:50:29 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: 739048 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp742786wrt; Sun, 29 Oct 2023 07:52:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6kBazsyWLK7r36xXj0xX+z0irlVS1yLk2oy/2dUAwFFArenS4R9UJ8R6gsBxX3tkpBdK1 X-Received: by 2002:a05:6214:5507:b0:671:9d4c:64ce with SMTP id mb7-20020a056214550700b006719d4c64cemr4351180qvb.24.1698591144426; Sun, 29 Oct 2023 07:52:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698591144; cv=none; d=google.com; s=arc-20160816; b=JfvMY92xpwzyB9JBgF0DZX4NRg/NYJ0qBEG2OQ/O0oFBFjUSxEukiCl6D3R4d3xljA gy90ix/nZTL7uuM5HyB8oJriPeriAurLW7xdMxjTtvYAyJY9C0zx/sYM84dDZt2DN97G siuTxMhNcvMqsVIxmeessWlDpBa3E10dpz6x5ajpMZ0qTM5CvgZwFquX9b4WsuE80EGz Qc67crgNGMjaoezLuWsdWTYbc6MBK6IpWOb4j0tkF1ysX/ZFkTuQNVAdF5tYzUduKmGt 3nQJl2uhaDIUVE0ftILAvqJCXfXG/PyIiAHZrhDstYNz+Rgu+ka5E+bGWjTgI0l88J12 i7vw== 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=mkWb8KxbRn7S6TI1+xj2cQh6vUFfFjkeGhBJwdoRHV8=; fh=xfTKN0dOWXSBe88Qf19pDztkyZ/4+zDTR3+/QiZRr4s=; b=b4QmdCyjdeyDGDDCW1WqF0ScuAS+hjWyEfFsq1VJanU4Hc5FIp+7t0xuRRqITey/ij OOWVhhktg2Efz5Wo6p1vKlOsOLUhH0Tp0SfuU5u5oD21WIimssuy+rTFxFcwDrsv1Ub3 e/lN9Z4ymfTTG17jf9xinIRyKZM83ArgeDMYcjMQgvC2TADIRVqGSDGc+u7hhUA3QilC XJfxyrWtwlt9a3V/EaQL8Cszszu9oACZyQmxs9/4CHL9V4IzTo/moiqC+2UMF2DSThpb J4sP6sItXC8Ut8gxurHYI3S0hI43JQvjvsUb/8qiirwRjHAv4bSmUl+DGoDncOHICUap rs8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TjniL1Pn; 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 qs14-20020a05620a394e00b00773fa79ce55si3969915qkn.483.2023.10.29.07.52.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 29 Oct 2023 07:52:24 -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=TjniL1Pn; 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 1qx77v-0007eJ-99; Sun, 29 Oct 2023 10:50:55 -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 1qx77q-0007Yv-41 for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:50 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qx77k-00059O-UX for qemu-devel@nongnu.org; Sun, 29 Oct 2023 10:50:49 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40790b0a224so26962275e9.0 for ; Sun, 29 Oct 2023 07:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698591043; x=1699195843; 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=mkWb8KxbRn7S6TI1+xj2cQh6vUFfFjkeGhBJwdoRHV8=; b=TjniL1Pnnn1YOPZOrLAK6tkZfpRduhEcCgn9U1OzksbAMkRKMHIn4jgnTB5BXdNfrD QO5YAYBXjPKdKkzXfZmSj4tkedBspzIQVTDYS3w7gNRuplIJ1tzJsKBgjkd9Rz6KwRgd Xedbu0nkDMzoomiECgP7p5OhW1GSXfK/6q1HqfQhU/O8pGaQ/ZRafveFpfQIZL/dyG0T X3MgGUPCvI1vSP8BhxZ69JpU8qa1NIQ2goVhSMO4aDHVj35sr3tYioFSBcPLkeQ17VuP B2PiGzaiLKNumzZlHW5uB+gpB6N48BKvDDQ3DFUkdUX8xcgUVy5o2lTwqPWA8n+uX9vu 8lSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698591043; x=1699195843; 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=mkWb8KxbRn7S6TI1+xj2cQh6vUFfFjkeGhBJwdoRHV8=; b=wGbso4mQd+uRHO6ZIBeLn7mvoc85tocExRVnT46RnQG7UsF404d6Qcj4vx+r3QYOzh eUkPZYSsmlTP1fMHzxcWumzcMwnU1zG8DRbNSrjX71uyaU83+22GZARZElxx3zRh2KHa WcWsr2wBtSxkSxx42f5VMoaUNiHL4KkWb1jCs1EX/BPYtn0n2u8xzUsdzuKeALxJSoEm M83Fbgz1z/myPT2U7eSwle4uBfEeIClFS5/FrfCF3xElx34TvCuBM+QIccwrO0YIVnRB OOI4hfYzHxzPaUjmHsMLIwwZBmot7L0/int4i+KLXNKBuD7a6mtuxPLzs8gF2+ZVIena JZDw== X-Gm-Message-State: AOJu0Yy4bWl87ZMbHZgzMG3ewUDJEKMOYI2GSfLE0w6pzBfknIdhnJYG hZ4qZbNMjxV6TR8VYXSYb6x3uw== X-Received: by 2002:a05:6000:1445:b0:32f:7a07:be07 with SMTP id v5-20020a056000144500b0032f7a07be07mr4472813wrx.17.1698591043581; Sun, 29 Oct 2023 07:50:43 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k6-20020adff286000000b0032da8fb0d05sm6071554wro.110.2023.10.29.07.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 07:50:40 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 89FDD656E6; Sun, 29 Oct 2023 14:50:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Paolo Bonzini , Mahmoud Mandour , Wainer dos Santos Moschetta , Brad Smith , Aleksandar Rikalo , Kyle Evans , Aurelien Jarno , Jiaxun Yang , qemu-arm@nongnu.org, Peter Maydell , Thomas Huth , Warner Losh , "Edgar E. Iglesias" , Eduardo Habkost , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Brian Cain , Alexandre Iooss Subject: [PATCH v2 15/19] tests/docker: upgrade debian-all-test-cross to bookworm Date: Sun, 29 Oct 2023 14:50:29 +0000 Message-Id: <20231029145033.592566-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231029145033.592566-1-alex.bennee@linaro.org> References: <20231029145033.592566-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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 Acked-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20231028103311.347104-14-alex.bennee@linaro.org> --- .../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