From nobody Fri Nov 14 18:19:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760438750; cv=none; d=zohomail.com; s=zohoarc; b=WERHk4ihsAAKoj3kSUQ4Ki/4H65sI3aSl7JylAoklQkUIZD4MTGmqzGxegJ3azm5YbYaKrimvLIe6rjMh5utX36QQ9gv4bxeQgNZYli+twvHtZGIASYOMIxDxmy9XFipeLmidZGQVY/DksRI8PF2JjzUCobC8phG7shOYcM/b6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760438750; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ogDLw91ptCfy9iIm2H0w8Em9wCPoPjeWqc1JSb8NZJ8=; b=iq9uCyxSyhbNTIO1hKDbyTmWeUX92yEiJtMKHaO/yGQZZsxcy7V8ajtioc9/OCqPnKV/xIi2M1nW5vd4GDBUgE3SDyWPxSD5l5XxptkYgKaJGN0nnh6KxSaEPG/rwsDaHn1ukJPJibRRPckExBjaEh2ZUOixEaNEKHNVFIBfnho= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760438750215670.9699075744398; Tue, 14 Oct 2025 03:45:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8cWI-0005be-Pi; Tue, 14 Oct 2025 06:44:42 -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 1v8cVV-0004d1-K0 for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:55 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8cVF-0003X1-4e for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:52 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-46e61ebddd6so55783415e9.0 for ; Tue, 14 Oct 2025 03:43:28 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb49bd977sm233413605e9.11.2025.10.14.03.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 03:43:24 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 81E515F82B; Tue, 14 Oct 2025 11:43:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760438606; x=1761043406; 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=ogDLw91ptCfy9iIm2H0w8Em9wCPoPjeWqc1JSb8NZJ8=; b=OBscSoLdu0KXaNRr3qGT6dxr6h4CeVZrTlWKNhQf7ftLx2ceYEzadOrFAdsBAKs3SU 1yRSo7sgbZKe9qn4qD1kbw9XsoDwTuGruY3Pv0q6yhX27shkaNbGAyxqbiUsIeVwJfI/ os7RNIWe/t9DxbfkovgBeDIYVFZLQEV6uxxJZZnM5Tt0hHKvAWsznBV0LoATaop06cy1 zcRoAoJ8cam6HyuLKa6+qloJ0nx0xrpZ1draLIdhXjjlQ9dpzGb7HR5VGP5H4KYNUs5v Rv4bzOtdeJRcL+rimawSGOXZIqA9UnXCZhQU5gWQb75In7enEeNMCTO13U31G2oqE35x RrHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760438606; x=1761043406; 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=ogDLw91ptCfy9iIm2H0w8Em9wCPoPjeWqc1JSb8NZJ8=; b=ev3rIjce0eXhzZqnVxT3u4YzJ8uQIcsFPwsTRbTjjP0nKbq6vROo7qg7SFGfoin4EJ uwrx32xOZ41AnZtYQRlY7G5Td3YcoyNqJ1ok6bXQo9mgsdOAW7gQ9P9XnbG2UMWHkmbq A6VxyzZ9F+hsoJzwnPwX93S3EnXhcktDwtx7oOmfK6tX4qtf/aXsY7ft1pdpq5NuSKWC XhZOp1gtnfELu478/Ezp0Dz/BThemsWfk6RZPmLQppzlwBBe+RhuaBtijQqwzOKxdHyn rbuCZc5Uh49h2HP6hLowu7+LKAgLDAhEAiWKOC2AytFopepePcauym5wi68J31mt2Wn7 vbUA== X-Gm-Message-State: AOJu0YyURSRy51jG+yPSnDZgN6oRKmXgragHi9rVnCyB2FoEoRrLPKSd VKtvAeHeUa4U8thygcd6ZRT1dETSRkIPkScfy3s7yomJed7tyNLDdyZ4Hmgtq9uJazs= X-Gm-Gg: ASbGncsjoWqFYkLvgc4Q24SzYGIsuyxPja+P1/nIw+dLYJTfHnXPtTSRjl8XAcASrTB TpxQOish/UKBGv4jUfGCwvOTPpx8zakHBg9HuJkoPe07LnJHFc8Zn+z2MKxu+6GLN/qwoBnRCiS n24m5dFodgRmz7LrQe6cW+ywMuaFRaOPpnZDRC7Skt4TI9BC5JTDnI4I6nCnvLQIlxaE9q8DKkW ccNem7RsDpWdmFHjNk9/s0TNaZzexAtjC4v7yfSVAStGdhBuEM1OOMGCy+I2ddPuqKABNFGDbkw TCwewSaZlwaNrPVo4xHYz5qhm5vxHj3bKDewxMXnVIAkM/yKSCRvOZT8f3Jp2KA+iv93NXxOQwn sNTECNb42hM0Tffg/BdazyViN3PhyfcTqHNcPNcMVgdZb9Q== X-Google-Smtp-Source: AGHT+IG/WVuMLWQ69MkhEn81MGHpVyaEf8a+jcmLNNH8AtJM8fLeQMl+Rl+oiGzwDTLDd1YH2e8zOg== X-Received: by 2002:a05:600c:198f:b0:46e:3b1a:20d7 with SMTP id 5b1f17b1804b1-46fa9af8595mr197661885e9.19.1760438605672; Tue, 14 Oct 2025 03:43:25 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, Gustavo Romero , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , BALATON Zoltan , qemu-s390x@nongnu.org Subject: [PATCH 1/5] tests/lcitool: bump to latest version and regenerate (!wait on upstream) Date: Tue, 14 Oct 2025 11:43:18 +0100 Message-ID: <20251014104323.3023714-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014104323.3023714-1-alex.bennee@linaro.org> References: <20251014104323.3023714-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760438752425154100 Now that lcitool can build cross images for Ubuntu and expose just the foreign layer to yaml output re-generate the armhf package list. Signed-off-by: Alex Benn=C3=A9e --- upstream MR: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/552 --- scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml | 4 ++-- scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml | 4 ++-- tests/docker/dockerfiles/alpine.docker | 10 +++++----- tests/docker/dockerfiles/centos9.docker | 10 +++++----- .../docker/dockerfiles/debian-amd64-cross.docker | 16 ++++++++-------- .../docker/dockerfiles/debian-arm64-cross.docker | 16 ++++++++-------- .../docker/dockerfiles/debian-armhf-cross.docker | 16 ++++++++-------- .../docker/dockerfiles/debian-i686-cross.docker | 16 ++++++++-------- .../dockerfiles/debian-mips64el-cross.docker | 16 ++++++++-------- .../dockerfiles/debian-mipsel-cross.docker | 16 ++++++++-------- .../dockerfiles/debian-ppc64el-cross.docker | 16 ++++++++-------- .../dockerfiles/debian-riscv64-cross.docker | 16 ++++++++-------- .../docker/dockerfiles/debian-s390x-cross.docker | 16 ++++++++-------- tests/docker/dockerfiles/debian.docker | 10 +++++----- .../dockerfiles/fedora-rust-nightly.docker | 10 +++++----- .../docker/dockerfiles/fedora-win64-cross.docker | 14 +++++++------- tests/docker/dockerfiles/fedora.docker | 10 +++++----- tests/docker/dockerfiles/opensuse-leap.docker | 10 +++++----- tests/docker/dockerfiles/ubuntu2204.docker | 10 +++++----- tests/lcitool/libvirt-ci | 2 +- 20 files changed, 119 insertions(+), 119 deletions(-) diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml b/scripts/ci/= setup/ubuntu/ubuntu-2404-aarch64.yaml index ce632d97108..70063db198e 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml @@ -26,7 +26,7 @@ packages: - git - hostname - libaio-dev - - libasan6 + - libasan8 - libasound2-dev - libattr1-dev - libbpf-dev @@ -37,7 +37,7 @@ packages: - libcap-ng-dev - libcapstone-dev - libcbor-dev - - libclang-dev + - libclang-rt-dev - libcmocka-dev - libcurl4-gnutls-dev - libdaxctl-dev diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml b/scripts/ci/se= tup/ubuntu/ubuntu-2404-s390x.yaml index f45f75c9602..4f1a49be34a 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml @@ -26,7 +26,7 @@ packages: - git - hostname - libaio-dev - - libasan6 + - libasan8 - libasound2-dev - libattr1-dev - libbpf-dev @@ -37,7 +37,7 @@ packages: - libcap-ng-dev - libcapstone-dev - libcbor-dev - - libclang-dev + - libclang-rt-dev - libcmocka-dev - libcurl4-gnutls-dev - libdaxctl-dev diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index 52adf9ccbb7..1da375c9158 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -126,11 +126,11 @@ RUN apk update && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" # https://gitlab.alpinelinux.org/alpine/aports/-/issues/17463 RUN apk add clang19-libclang # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerf= iles/centos9.docker index 0674d778262..ff3e8069b45 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -132,11 +132,11 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index 7f4674400df..26a39940126 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -72,11 +72,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture amd64 && \ @@ -178,9 +178,9 @@ endian =3D 'little'\n" > /usr/local/share/meson/cross/x= 86_64-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-cc= && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-gcc =20 -ENV ABI "x86_64-linux-gnu" -ENV MESON_OPTS "--cross-file=3Dx86_64-linux-gnu" -ENV RUST_TARGET "x86_64-unknown-linux-gnu" +ENV ABI=3D"x86_64-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Dx86_64-linux-gnu" +ENV RUST_TARGET=3D"x86_64-unknown-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-linux-gnu- ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-lin= ux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index c7cd54ee5ca..4b0163fa1b9 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -72,11 +72,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture arm64 && \ @@ -177,9 +177,9 @@ endian =3D 'little'\n" > /usr/local/share/meson/cross/a= arch64-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c= c && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g= cc =20 -ENV ABI "aarch64-linux-gnu" -ENV MESON_OPTS "--cross-file=3Daarch64-linux-gnu" -ENV RUST_TARGET "aarch64-unknown-linux-gnu" +ENV ABI=3D"aarch64-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Daarch64-linux-gnu" +ENV RUST_TARGET=3D"aarch64-unknown-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Daarch64-linux-gnu- ENV DEF_TARGET_LIST aarch64-softmmu,aarch64-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index 627d41c6dee..742031ce0a2 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -72,11 +72,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture armhf && \ @@ -174,9 +174,9 @@ endian =3D 'little'\n" > /usr/local/share/meson/cross/a= rm-linux-gnueabihf && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -gcc =20 -ENV ABI "arm-linux-gnueabihf" -ENV MESON_OPTS "--cross-file=3Darm-linux-gnueabihf" -ENV RUST_TARGET "armv7-unknown-linux-gnueabihf" +ENV ABI=3D"arm-linux-gnueabihf" +ENV MESON_OPTS=3D"--cross-file=3Darm-linux-gnueabihf" +ENV RUST_TARGET=3D"armv7-unknown-linux-gnueabihf" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Darm-linux-gnueabihf- ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker index 2998764065f..1ccfde2e4bb 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -72,11 +72,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture i386 && \ @@ -174,9 +174,9 @@ endian =3D 'little'\n" > /usr/local/share/meson/cross/i= 686-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc &= & \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc =20 -ENV ABI "i686-linux-gnu" -ENV MESON_OPTS "--cross-file=3Di686-linux-gnu" -ENV RUST_TARGET "i686-unknown-linux-gnu" +ENV ABI=3D"i686-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Di686-linux-gnu" +ENV RUST_TARGET=3D"i686-unknown-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Di686-linux-gnu- ENV DEF_TARGET_LIST i386-softmmu,i386-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 6e88777f76d..eeb77212d5d 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -71,11 +71,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mips64el && \ @@ -173,9 +173,9 @@ endian =3D 'little'\n" > /usr/local/share/meson/cross/m= ips64el-linux-gnuabi64 && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc =20 -ENV ABI "mips64el-linux-gnuabi64" -ENV MESON_OPTS "--cross-file=3Dmips64el-linux-gnuabi64" -ENV RUST_TARGET "mips64el-unknown-linux-gnuabi64" +ENV ABI=3D"mips64el-linux-gnuabi64" +ENV MESON_OPTS=3D"--cross-file=3Dmips64el-linux-gnuabi64" +ENV RUST_TARGET=3D"mips64el-unknown-linux-gnuabi64" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dmips64el-linux-gnuabi64- ENV DEF_TARGET_LIST mips64el-softmmu,mips64el-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index 5f4e3fa9636..9b3dca44f15 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -71,11 +71,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture mipsel && \ @@ -173,9 +173,9 @@ endian =3D 'little'\n" > /usr/local/share/meson/cross/m= ipsel-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc= && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc =20 -ENV ABI "mipsel-linux-gnu" -ENV MESON_OPTS "--cross-file=3Dmipsel-linux-gnu" -ENV RUST_TARGET "mipsel-unknown-linux-gnu" +ENV ABI=3D"mipsel-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Dmipsel-linux-gnu" +ENV RUST_TARGET=3D"mipsel-unknown-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dmipsel-linux-gnu- ENV DEF_TARGET_LIST mipsel-softmmu,mipsel-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index dfa690616d1..15c6b436d31 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -72,11 +72,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture ppc64el && \ @@ -176,9 +176,9 @@ endian =3D 'little'\n" > /usr/local/share/meson/cross/p= owerpc64le-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-gcc =20 -ENV ABI "powerpc64le-linux-gnu" -ENV MESON_OPTS "--cross-file=3Dpowerpc64le-linux-gnu" -ENV RUST_TARGET "powerpc64le-unknown-linux-gnu" +ENV ABI=3D"powerpc64le-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Dpowerpc64le-linux-gnu" +ENV RUST_TARGET=3D"powerpc64le-unknown-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dpowerpc64le-linux-gnu- ENV DEF_TARGET_LIST ppc64-softmmu,ppc64-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/d= ocker/dockerfiles/debian-riscv64-cross.docker index 09b2953f32c..7a395cc594c 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -72,11 +72,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture riscv64 && \ @@ -179,9 +179,9 @@ endian =3D 'little'\n" > /usr/local/share/meson/cross/r= iscv64-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-c= c && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g= cc =20 -ENV ABI "riscv64-linux-gnu" -ENV MESON_OPTS "--cross-file=3Driscv64-linux-gnu" -ENV RUST_TARGET "riscv64gc-unknown-linux-gnu" +ENV ABI=3D"riscv64-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Driscv64-linux-gnu" +ENV RUST_TARGET=3D"riscv64gc-unknown-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Driscv64-linux-gnu- ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index 09a78c15baf..57aa3209c5c 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -72,11 +72,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ dpkg --add-architecture s390x && \ @@ -175,9 +175,9 @@ endian =3D 'big'\n" > /usr/local/share/meson/cross/s390= x-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc = && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc =20 -ENV ABI "s390x-linux-gnu" -ENV MESON_OPTS "--cross-file=3Ds390x-linux-gnu" -ENV RUST_TARGET "s390x-unknown-linux-gnu" +ENV ABI=3D"s390x-linux-gnu" +ENV MESON_OPTS=3D"--cross-file=3Ds390x-linux-gnu" +ENV RUST_TARGET=3D"s390x-unknown-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Ds390x-linux-gnu- ENV DEF_TARGET_LIST s390x-softmmu,s390x-linux-user # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfi= les/debian.docker index 8dd893be4b0..bbb920c6815 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -152,11 +152,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" # netmap/cscope/global RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/do= cker/dockerfiles/fedora-rust-nightly.docker index 7d31c9f4060..e4233b53cbe 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -152,11 +152,11 @@ exec "$@"\n' > /usr/bin/nosync && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" RUN dnf install -y wget ENV RUSTUP_HOME=3D/usr/local/rustup CARGO_HOME=3D/usr/local/cargo ENV RUSTC=3D/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/= bin/rustc diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index c76a70c3684..e6f84dd556f 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -72,11 +72,11 @@ exec "$@"\n' > /usr/bin/nosync && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" =20 RUN nosync dnf install -y \ mingw-w64-tools \ @@ -110,8 +110,8 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= gcc =20 -ENV ABI "x86_64-w64-mingw32" -ENV MESON_OPTS "--cross-file=3D/usr/share/mingw/toolchain-mingw64.meson" +ENV ABI=3D"x86_64-w64-mingw32" +ENV MESON_OPTS=3D"--cross-file=3D/usr/share/mingw/toolchain-mingw64.meson" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-w64-mingw32- ENV DEF_TARGET_LIST x86_64-softmmu # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 891a740fcbc..632259378c9 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -152,11 +152,11 @@ exec "$@"\n' > /usr/bin/nosync && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 75e17477807..def0ca9db46 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -138,11 +138,11 @@ RUN /usr/bin/pip3.11 install \ sphinx \ sphinx-rtd-theme =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3.11" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3.11" # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dock= erfiles/ubuntu2204.docker index b393db55a8c..e9f059d0659 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -150,11 +150,11 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ =20 RUN /usr/bin/pip3 install meson=3D=3D1.8.1 =20 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" +ENV LANG=3D"en_US.UTF-8" +ENV MAKE=3D"/usr/bin/make" +ENV NINJA=3D"/usr/bin/ninja" +ENV PYTHON=3D"/usr/bin/python3" ENV RUSTC=3D/usr/bin/rustc-1.77 ENV RUSTDOC=3D/usr/bin/rustdoc-1.77 ENV CARGO_HOME=3D/usr/local/cargo diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 9da20ff7c3b..1b943062a29 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 9da20ff7c3bc9067804a7561c2ff87583b434853 +Subproject commit 1b943062a29cf56b5e6d7aedf865843d65ba69a7 --=20 2.47.3 From nobody Fri Nov 14 18:19:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760438660; cv=none; d=zohomail.com; s=zohoarc; b=NLpE2PtadgkfgSvSiUg3VGWy5qQhH9CM9g/nDGXEtT2FA2qskO5dw3PSj29ELQt6CUIH++v/V0xFDQTzlLEVAtR020RHv3QzR4C2T/76cMRvy7xMVmrZ1jV+s/68fJTj4DwgAX+epI9q9CrQo1wc5k7r/uZl6YLrNUZRzAUXtkM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760438660; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EO8zY+f+eRKXz2hwkLNT6XbeCb6L/izof5+RV6C6SZU=; b=DilUdDn9ej0I2Mdlh8TFIdv2mONMN2JVVh/tAdGtk/fUHcdeibY7MoDw9KdcrCadYdiq19Gd+t89JoqOkxkfTIDzBk/Vj0q7X0ynv83vETmmW64oPRFT1RKiLTmUMpNUpXe6K1rOvGBm8EwH9JMY9VOwuTg/Ih2Lf3nLgP4t4PY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 176043866017012.825100165441427; Tue, 14 Oct 2025 03:44:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8cVc-0004cC-W2; Tue, 14 Oct 2025 06:44:04 -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 1v8cVJ-0004PZ-6x for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:41 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8cVA-0003XO-Pv for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:39 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e33b260b9so41763045e9.2 for ; Tue, 14 Oct 2025 03:43:29 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb483bbb4sm228072675e9.5.2025.10.14.03.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 03:43:24 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 9CBAE5F82E; Tue, 14 Oct 2025 11:43:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760438607; x=1761043407; 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=EO8zY+f+eRKXz2hwkLNT6XbeCb6L/izof5+RV6C6SZU=; b=sQEimhS6YJc3p+eM8jleuzLoDCPgTIA3U7mkIZT8XIy5aqvymfpjBTIay47TSJpqqk ecS2dK9riAQXgobfl7q0yBTdwz/J0TId/ko0FNAhWsqLi050NsVxHJrY1u99uzsJ4yvE LrQn8mThCBQgxG2Q8Am+cbmLPBM4+SolfLLRHrzqff84wnDS82+ypW9EjB6V+0JlUKfv eFXf8I1B6UGyOQgG58wusuukOlXXLoEz4M6q1vVhdlKvOJP4lIn16K2ndd3dt9MM4qiw rWKPMzlLJAUGAHB9Ldo+dilpydbQdw7sIZlgqjyqvuJ/XGJyoEmO9VrjZtbuOMySezl1 x5DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760438607; x=1761043407; 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=EO8zY+f+eRKXz2hwkLNT6XbeCb6L/izof5+RV6C6SZU=; b=oxlSRebESf/V/i6QBEtv8r56EqMxD8AUdP2F2/Z0rv0H9TQQHGgzcjkuu2El5XyAso 4LAzgSJGV3damYxR1TbInQyyheeOiCXlz8Z9NVdq5Re+EE0a+vjiaEpo+AHwYlCLrCPP B7BmgBmDkUZv56bLEvosNoaCw2Lzbvt9wYAxZxQlYtP9dS7UohXhkhtKcLrvoKkly+T9 wSOy443jo87qTjfwueFkNFvFR1XO2zujFxaafT4jWGJe4quB0A2EVL4I2+C00lv1RHNU BdGrRy+9vh5QWHU4eyHIDd8hYDRLps7XuIE8sJqlOU5R31aRhU8Ye7C9HK/DMtmrrSw1 jYqw== X-Gm-Message-State: AOJu0YxjEOJykpFStROiO55ptyzrl43x0zXEUlQI3g6Db/+61xT7TQK6 jYCWEmGYNxalFABwnFGsTu2UD1r9GT8nO/XEefiWlagcjqNtVR0zK8QonlkrEQEn6SETBLYUn4x ZFhIr X-Gm-Gg: ASbGncvXuNBaWv4T31fpPaTFuiUN48G4dqyqGWJHPH6W9ZKtjDdO8bw5B5VhWSp74lZ ulvCV6Ka9pq2LvFkYiMSbDGt6B1p1Hlht0AEmVa0RUrpV5BRJ8J65dXno36QILxNhRNNv9ZaGtv X2NanP6DNUNh3zYTjd+vAmuK0tq8UuSuO35jeW4rFt4J44VLNH2h1dsysEDG/b1oiv1h0e2JQFz mjAnTnkdD6EsGWz53XfFjEffIXmTycA6LKfH5DrxN9E6AXm1GLSmSxYULmkPWqJKexbt6a8CYUz zzkKmzuAScH/ZoqZnd6rvNZV/raBcDJHy6SlVxeUMwMfI6rMMQmCy+QlOLm4BFBxUNkR+rkXBJa eRAx3jgPzbeuyo/ckKg7g5BmIN11AkAZE96tJ3NTAHuQHpsBB5G69FKvNgdQuYOJFIeY= X-Google-Smtp-Source: AGHT+IFwJhO+nMnCak8vPAUUDB2ZPcS6LECaLtXCr5s84NxuuwP7ekdNQERMTqllx5VSHmlodx9k6g== X-Received: by 2002:a05:600c:c091:b0:46e:59bd:f7d3 with SMTP id 5b1f17b1804b1-46fae33dffamr95782725e9.20.1760438607269; Tue, 14 Oct 2025 03:43:27 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, Gustavo Romero , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , BALATON Zoltan , qemu-s390x@nongnu.org Subject: [PATCH 2/5] gitlab: use template for ubuntu-24.04-aarch64 jobs Date: Tue, 14 Oct 2025 11:43:19 +0100 Message-ID: <20251014104323.3023714-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014104323.3023714-1-alex.bennee@linaro.org> References: <20251014104323.3023714-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760438663577154100 Most of the test is pure boilerplate so to save ourselves from repetition move all the main bits into a minimal copy of native_build_job_template but without the caching. We keep all the current allow_fail and configure setups but do take the opportunity to replace the -j`nproc --ignore=3D40` hack with something that almost, but not quite, saturates the machine its being built on. Signed-off-by: Alex Benn=C3=A9e --- .../custom-runners/ubuntu-24.04-aarch64.yml | 230 ++++++++---------- 1 file changed, 96 insertions(+), 134 deletions(-) diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml b/.gitlab= -ci.d/custom-runners/ubuntu-24.04-aarch64.yml index d26c7827f45..46db9ae0138 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml @@ -2,150 +2,112 @@ # setup by the scripts/ci/setup/ubuntu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 24.04" =20 +.ubuntu_aarch64_template: + extends: .custom_runner_template + needs: [] + stage: build + tags: + - ubuntu_24.04 + - aarch64 + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + - if: "$AARCH64_RUNNER_AVAILABLE" + before_script: + - source scripts/ci/gitlab-ci-section + - section_start setup "Pre-script setup" + - JOBS=3D$(expr $(nproc) - 4) + - section_end setup + script: + - mkdir build + - cd build + - section_start configure "Running configure" + - ../configure $CONFIGURE_ARGS || + { cat config.log meson-logs/meson-log.txt && exit 1; } + - section_end configure + - section_start build "Building QEMU" + - make --output-sync -j"$JOBS" + - section_end build + - section_start test "Running tests" + - if test -n "$MAKE_CHECK_ARGS"; + then + make -j"$JOBS" $MAKE_CHECK_ARGS ; + fi + - section_end test + ubuntu-24.04-aarch64-all-linux-static: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - - if: "$AARCH64_RUNNER_AVAILABLE" - script: - - mkdir build - - cd build - # Disable -static-pie due to build error with system libc: - # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 - - ../configure --enable-debug --static --disable-system --disable-pie - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make check-tcg - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + # Disable -static-pie due to build error with system libc: + # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 + CONFIGURE_ARGS: --enable-debug --static --disable-system --disable-pie + MAKE_CHECK_ARGS: check-tcg =20 ubuntu-24.04-aarch64-all: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true =20 ubuntu-24.04-aarch64-without-defaults: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-user --without-default-devices --without-default= -features - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --disable-user --without-default-devices --without-def= ault-features + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true =20 ubuntu-24.04-aarch64-alldbg: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - - if: "$AARCH64_RUNNER_AVAILABLE" - script: - - mkdir build - - cd build - - ../configure --enable-debug - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make clean - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --enable-debug + MAKE_CHECK_ARGS: check-tcg =20 ubuntu-24.04-aarch64-clang: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh --cc=3Dclang --cxx=3Dclang++ --enable-ubs= an - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-ubsan + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true =20 ubuntu-24.04-aarch64-tci: - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --enable-tcg-interpreter - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --enable-tcg-interpreter + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true =20 ubuntu-24.04-aarch64-notcg: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-tcg --with-devices-aarch64=3Dminimal - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --disable-tcg --with-devices-aarch64=3Dminimal + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true --=20 2.47.3 From nobody Fri Nov 14 18:19:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760438684; cv=none; d=zohomail.com; s=zohoarc; b=lAsSsANfw+Fm7wgOWeB/n4y/7zfh82hSjru2d9YQ8h+Pm0SOT4umUHN6d65i7EwRz/DY1SVIJWxSwzyKcNf4wZbiEw0nTYFe2VHvMXCfck0bNGXZrWw2GHHIhESCrUxo3ZYTsH4snnod5NVDL92AVCNHMOPh9e4j7Rla/vOt0LI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760438684; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hIbkSUzuy95fWVG2YehHRKZZn6Jn1DT3kGS2n9ZFy4w=; b=VasGNpzn0+SgvF5xMG9ChqS736S3GnDEbcszKpVZSucPOeRx/TNPqCrHx2l2xa3/AzBIEItWayoGJAk8acHairso1dOgbTEhpnftWd7yw6gV5E1WAh8NcmJj6Cv+FF8jNWoJjrGWD/+So+EOWRG2dgWDsYFWrawyIwlqKMjOomU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760438684365689.9029914120447; Tue, 14 Oct 2025 03:44:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8cW4-0004y5-Oa; Tue, 14 Oct 2025 06:44:29 -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 1v8cVL-0004UQ-7a for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:44 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8cVB-0003X9-QT for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:42 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-46e42fa08e4so43610715e9.3 for ; Tue, 14 Oct 2025 03:43:28 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce5cf70fsm22221883f8f.27.2025.10.14.03.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 03:43:24 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id B23725F83C; Tue, 14 Oct 2025 11:43:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760438606; x=1761043406; 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=hIbkSUzuy95fWVG2YehHRKZZn6Jn1DT3kGS2n9ZFy4w=; b=IGE/rHihEkInGV3zRR/3EmBs5uRD3jp+9AnpLu6j/YwsqafnOjN5pyVpYm+IAQEGuN EJthRSAZM9Zu7FA2R/a9Hw8PAoWaZjt7McCf0CNpAsKNj/pWVfBKvHRxgzpK63oh5GWz KOjeqAtZ6jCQ469qKPtz2rNIbmmbtws+L7xKqhg5c18fN34FvRxEsYaa/1AJg9tREMYB qE9MFvxJ0VfPfR0GNgXQyzeE5SBjJt/tU2nGQ/JfqJtB3+MKPFhmJaCDiUQ+MSwqBxj+ piYUQD2GluVwkCQ3SubQm591onESZgSqVSMsmhi51nTMvNi3VE13S+cOUuUIZUzBpzYj ykog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760438606; x=1761043406; 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=hIbkSUzuy95fWVG2YehHRKZZn6Jn1DT3kGS2n9ZFy4w=; b=qK89toQcflCCGg0LVIskKADBCEQBVSOTzZ+lB6pxLKy68YzrGOqRh32dlkgdYNcX7Q mNVbviRokmfDJ1p7zbZorXw7Yd4R2J206fqbzjOsoTHc+Ep1/fGzmTVn/+HFlqmqgZMh vHG6COjNOGy4qxUfDXTU5EksaaHk4nB48gwmjLfZQG2aQf9Qkw+em9s60pFRDYUuKE5p GRzdEUAKfEr6XYNtKwqKYroCBBLJ5jDbiXxe1SwIfRmnedFXBNZNgQ+VXB7Szmc8T7Ry Gm0Z7s4yV8ZBJjmqSE1kIXvrVGI6fI8lVFzLUVMTT+OwDtLMYfOop3oMVD+vrIcoL75W 8MxA== X-Gm-Message-State: AOJu0Ywo0FhCgYbSeN0bH7fGH9k9sgH8RjrXt2cnk8Jx8f1J/9QfwLeQ mbMe5VtyGTVPmsxofxxZgu/KlQLpCuya1O3kxy6dVe1JmPrPnXeEZR/83Bcanu7XWbg= X-Gm-Gg: ASbGncs6hIfUMUb/pusuZVbZy1nICiYFhj8f303FGW2Pz+F6AcnMyMnRBp+zehSiX9I aPzTwESDyATAEHHhSt+juIhSUFwY5V4rhwtilUpDADFzTG94cfwohSbr6KLqhyAevIY3sq9B5LE Yi7vHEglYfBREJ6YcZ7KRgQ2X2AohjlPi++7XlkhgVWrOXwVG02Upjng9YOFFEqlYsuWf5JASGv ZcOVKLIgP/89KUYRZcVCLrrae7x3ADXwjEn8kFnbMKcdyPl2JuV+VErEhZluoJePjw/jIRBszLx s6PbxLugzR54a7SnK+RSVjF5fYzc2VysWJgbjywbV0ZgLYcYqfd2lJzXa92qBgRq9B042qY2TQY viHrP/k+8i/kLVh+NfxZPAGM9ac6+mVZMGfPFlcKUBDC2bg== X-Google-Smtp-Source: AGHT+IE5X7bSlEgQpG3QMyeIYGEdXpqE6l/mhSZdpcUHn6QYdxjN5qcU5j40aopNr0wL4Aiw2h6Smw== X-Received: by 2002:a05:600c:608d:b0:46e:6d5f:f59 with SMTP id 5b1f17b1804b1-46fa9a8b2aemr167346395e9.4.1760438606466; Tue, 14 Oct 2025 03:43:26 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, Gustavo Romero , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , BALATON Zoltan , qemu-s390x@nongnu.org Subject: [PATCH 3/5] gitlab: modernise the ubuntu24.04-aarch32 jobs Date: Tue, 14 Oct 2025 11:43:20 +0100 Message-ID: <20251014104323.3023714-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014104323.3023714-1-alex.bennee@linaro.org> References: <20251014104323.3023714-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760438688695158500 We only have one job here so no point using a template but we might as well update the JOBS calculation and use our fancy section markers. Signed-off-by: Alex Benn=C3=A9e --- .../custom-runners/ubuntu-24.04-aarch32.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml b/.gitlab= -ci.d/custom-runners/ubuntu-24.04-aarch32.yml index 75029c9187e..3e7fdc8fa98 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml @@ -16,10 +16,21 @@ ubuntu-24.04-aarch32-all: - if: "$AARCH32_RUNNER_AVAILABLE" when: manual allow_failure: true + before_script: + - source scripts/ci/gitlab-ci-section + - section_start setup "Pre-script setup" + - JOBS=3D$(expr $(nproc) - 4) + - section_end setup script: - mkdir build - cd build + - section_start configure "Running configure" - ../configure --cross-prefix=3Darm-linux-gnueabihf- || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + - section_end configure + - section_start build "Building QEMU" + - make --output-sync -j"$JOBS" + - section_end build + - section_start test "Running tests" + - make --output-sync -j"$JOBS" check + - section_end test --=20 2.47.3 From nobody Fri Nov 14 18:19:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760438732; cv=none; d=zohomail.com; s=zohoarc; b=DjhEDxRfN0MNAlvnXLGRvdMIdt8rQyGt9GGTDZA+Ikw+qxEfyoLB4SAmo/QMneGvexYtV2aWpCwlpSMVuLiW/nbwclFFuitBpOkC6SqEnTUHpnLFWViZSouR1tGQmjXMF8B2sI5gMAhy1OcKReBf98UtC+ewqdUdtuom8ylf7FI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760438732; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KNf+WB9/HHEpVf98t3lNdtnVbvRPlPY/srMoe1KsGrk=; b=IbSFraqfo9I76mhBCFVj+4/u/dgatGKjXILHKOKjkmRkZR/M1aWzSTuwze24/vR4v0bdoZLJEhc3e7sJs59hB8tlvcpEEkGWUIofvvIWIvqc9RZWjKNMzzMy5ZiqkDWOUVl5T5l1wZO3zjUQBjK5Wjs+9esf+uCbUEjs9Y2gNHo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760438732893583.2198634267146; Tue, 14 Oct 2025 03:45:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8cWW-0005pD-0d; Tue, 14 Oct 2025 06:45:01 -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 1v8cVU-0004dE-P8 for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:54 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8cVG-0003Xt-5X for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:52 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-46fcf9f63b6so6844445e9.2 for ; Tue, 14 Oct 2025 03:43:31 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fb497b8fcsm234993105e9.2.2025.10.14.03.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 03:43:25 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C97A45F871; Tue, 14 Oct 2025 11:43:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760438609; x=1761043409; 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=KNf+WB9/HHEpVf98t3lNdtnVbvRPlPY/srMoe1KsGrk=; b=vYxkpwhyStJsgyTnCCsHwsc2q1jdP5zvS8Ji24tLgUXP29kiKZLuKdDqeuIc+m1JmU KpxKqId55SIr/FBmK2mkYwsqJB14BFD6iFNGMyS6lhJZBg1LZj6Wp6V8yaAFf310Yy9t 0pXCy9/GRDGFDSbgG+XTn2oLKOiFTZahHDbNdxBjeYGsUd7MrrkoiM++B6m4PDNSkGJE lfnIs+frqaadaavhoL1Z7ZuUriCZuyGYWYzeqrAYxLVT+xiHD7nJBQo++iRiOflPX5ty uTSyiVVcYUG1ZYQ8pvdg4U6zkhLTB343+kdmjXZ1me3vQnnwhSnhsUcjSaaiYH3/uyq4 saKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760438609; x=1761043409; 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=KNf+WB9/HHEpVf98t3lNdtnVbvRPlPY/srMoe1KsGrk=; b=Y/aEVzaWMEE3sAZnhTa5nwYVe71y+J/MIstyRBbiN4FTi4qdSJp3yvZs1iW6QB9T46 aUgRrkyemFcf1zQmIEHmQGw7hRdhXOTpjO80W/bUm4ISS6eqMZtNZb58YVMxwbJ22EdN eDH7lH5mUHf9/hllAt5DC6z7kpEFCp4IEnnB8LICxwwYdNNDV5rqnQjnvtz4nJmXfJep s7RrDiCuUUdhC40gdlxWvDTpvvZcpO22NuTv/Ghwj52xPBBTR+iz3D91GsFjDSTBYwEM l316aZx7V8W+SCR2ORFzGOF5y0t0g6HraQ6/Fd8evyLYIKivZO6Sj0lpRfVhPBEWAp0M J1zQ== X-Gm-Message-State: AOJu0YzLFhmLulEsTi7EAO5oXBU7mqUQ0p+v4qPF9V8/5u1LYXpMstFV lTPwwwe0FAJdBP+bIs9NVQBFG2ByQaXn5hXO/U/L9Kk5UE2RNBf0wIbnkoHkdNHXk68= X-Gm-Gg: ASbGnct1ahr1I4Gdrl7a03SrZw8gkxA4KqQdCYBurLhfOat5CinosuORvfhT4+8HQMe fxkW6vmrwbQDq1LqFbeT29Aityu8kYqWGVM+erlr7FLGdXjyfve95dOmCvDN0yWgBDcQW3C0K4r g80pZASefOTkO10hX/Bluead4Ib37S/o1k/n3qMuuafb76dkmCtdR5AISsqTvprw5CzS7AcD2g2 ypRAGCqfSaIBq+1wNMnwvIiJEzU56EhHzXGHt00D0zWHfE9k63D6FeraLWHyIr097AyDWD+zs14 fgA195LU3/Ar5d8O2Y/2MkwViP7Exq27a5ExvGQgjs0O989tMvvFfwrvdl8UQ4NA+7X9yOC0z4i wPplDPVDH0AGgNyCrjRvSjyQSS8QTymh4hB755sm9oH66fiGJPW4/VcKp X-Google-Smtp-Source: AGHT+IE5oziyVLzMIkHDhEJ8wnG4fD4sgI+5JeehZ5XWbQwN1z03PE5wfCSOix15Sslw5ge5i5kl4w== X-Received: by 2002:a05:600c:8b54:b0:46f:d897:516f with SMTP id 5b1f17b1804b1-46fd89758e7mr18901755e9.34.1760438608426; Tue, 14 Oct 2025 03:43:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, Gustavo Romero , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , BALATON Zoltan , qemu-s390x@nongnu.org Subject: [PATCH 4/5] scripts/setup: update the armhf overlay Date: Tue, 14 Oct 2025 11:43:21 +0100 Message-ID: <20251014104323.3023714-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014104323.3023714-1-alex.bennee@linaro.org> References: <20251014104323.3023714-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760438737133158500 We certainly didn't generate the armhf list via lcitool as it couldn't deal with ubuntu or foreign layers. Now we can properly generate the list. Fixes: 1417704564a (tests/lcitool: generate package lists for ansible) Signed-off-by: Alex Benn=C3=A9e --- ...armhf-cross.yml =3D> ubuntu-2404-armhf.yaml} | 65 +++---------------- tests/lcitool/refresh | 11 ++++ 2 files changed, 20 insertions(+), 56 deletions(-) rename scripts/ci/setup/ubuntu/{ubuntu-2204-armhf-cross.yml =3D> ubuntu-24= 04-armhf.yaml} (65%) diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml b/scripts/= ci/setup/ubuntu/ubuntu-2404-armhf.yaml similarity index 65% rename from scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml rename to scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml index 0cc34cd10b9..f06f95514bd 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml @@ -1,64 +1,13 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables --cross-arch armv7l ubuntu-2204 qemu +# $ lcitool variables --host-arch aarch64 --cross-arch armv7l ubuntu-2404= qemu # # https://gitlab.com/libvirt/libvirt-ci =20 packages: - - bash - - bc - - bison - - bsdextrautils - - bzip2 - - ca-certificates - - ccache - - dbus - - debianutils - - diffutils - - exuberant-ctags - - findutils - - flex - - gcc - - gcovr - - gettext - - git - - hostname - - libglib2.0-dev - - libpcre2-dev - - libsndio-dev - - libspice-protocol-dev - - llvm - - locales - - make - - meson - - mtools - - ncat - - ninja-build - - openssh-client - - pkgconf - - python3 - - python3-numpy - - python3-opencv - - python3-pillow - - python3-pip - - python3-sphinx - - python3-sphinx-rtd-theme - - python3-tomli - - python3-venv - - python3-yaml - - rpm2cpio - - sed - - socat - - sparse - - swtpm - - tar - - tesseract-ocr - - tesseract-ocr-eng - - xorriso - - zstd - gcc-arm-linux-gnueabihf - libaio-dev:armhf - - libasan6:armhf + - libasan8:armhf - libasound2-dev:armhf - libattr1-dev:armhf - libbpf-dev:armhf @@ -68,6 +17,7 @@ packages: - libcacard-dev:armhf - libcap-ng-dev:armhf - libcapstone-dev:armhf + - libcbor-dev:armhf - libcmocka-dev:armhf - libcurl4-gnutls-dev:armhf - libdaxctl-dev:armhf @@ -82,7 +32,7 @@ packages: - libglusterfs-dev:armhf - libgnutls28-dev:armhf - libgtk-3-dev:armhf - - libibumad-dev:armhf + - libgtk-vnc-2.0-dev:armhf - libibverbs-dev:armhf - libiscsi-dev:armhf - libjemalloc-dev:armhf @@ -94,11 +44,11 @@ packages: - libnfs-dev:armhf - libnuma-dev:armhf - libpam0g-dev:armhf + - libpcre2-dev:armhf - libpipewire-0.3-dev:armhf - libpixman-1-dev:armhf - libpng-dev:armhf - libpulse-dev:armhf - - librbd-dev:armhf - librdmacm-dev:armhf - libsasl2-dev:armhf - libsdl2-dev:armhf @@ -107,8 +57,11 @@ packages: - libselinux1-dev:armhf - libslirp-dev:armhf - libsnappy-dev:armhf + - libsndio-dev:armhf + - libspice-protocol-dev:armhf - libspice-server-dev:armhf - libssh-dev:armhf + - libstd-rust-dev:armhf - libsystemd-dev:armhf - libtasn1-6-dev:armhf - libubsan1:armhf @@ -119,7 +72,7 @@ packages: - libvdeplug-dev:armhf - libvirglrenderer-dev:armhf - libvte-2.91-dev:armhf - - libxen-dev:armhf + - libxdp-dev:armhf - libzstd-dev:armhf - nettle-dev:armhf - systemtap-sdt-dev:armhf diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 056cfb6e9d7..8ad45da19c1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -99,6 +99,16 @@ def generate_yaml(os, target, arch, trailer=3DNone): arch, target, "qemu"] generate(filename, cmd, trailer) =20 +# an overlay file only cares about the additional packages for cross +# so we can skip all the host packages needed. +def generate_cross_overlay_yaml(os, target, arch, name, cross, trailer=3DN= one): + filename =3D Path(src_dir, "scripts", "ci", "setup", os, f"{target}-{n= ame}.yaml") + cmd =3D lcitool_cmd + ["variables", "--format", "yaml", + "--layer", "foreign", + "-a", arch, "--cross", cross, + target, "qemu"] + generate(filename, cmd, trailer) + =20 alpine_extras =3D [ "# https://gitlab.alpinelinux.org/alpine/aports/-/issues/17463\n", @@ -271,6 +281,7 @@ try: # Ansible package lists # generate_yaml("ubuntu", "ubuntu-2404", "aarch64") + generate_cross_overlay_yaml("ubuntu", "ubuntu-2404", "aarch64", "armhf= ", cross=3D"armv7l") generate_yaml("ubuntu", "ubuntu-2404", "s390x") =20 =20 --=20 2.47.3 From nobody Fri Nov 14 18:19:10 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760438685; cv=none; d=zohomail.com; s=zohoarc; b=Jf7eSjytL8m2jkQiejJov3PBnuicACHcpJx4zRG+J/9VUyxOsvJ9BgKQ4Rw9nL4IXWC51ocNBGtLRhqGwTpBHy74nx5N9WAatuFpSGfZhrN5XDHCP/bUo6Se3lx/q94I7xFCFn/R5dkF3wrcPh1p0Nde+bRXs6e1hZPJ8sXR9TE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760438685; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=r45X5ko4sE/c2FtYGn13TPAX2fRw1g2ckflTuGJ2jhY=; b=XkCW10iIN0DcrgdUJtq6/OtTUr1u5vh+q7k3qhZQ3/0Qg4BOXxfC2HKX1DDBzTVqurNKndpSTQR1dXS6+Q7s+7KutDl65mDXss8B2EErFO461pZnQcIybvLYtkUQsDVy9aN23MDcd2bipASRXwAIyhHWusXh8RWZodHbXcNOkJU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760438685599895.274702412104; Tue, 14 Oct 2025 03:44:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8cW5-0004zO-F5; Tue, 14 Oct 2025 06:44:31 -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 1v8cVL-0004Ud-8m for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:44 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v8cVC-0003Xr-RI for qemu-devel@nongnu.org; Tue, 14 Oct 2025 06:43:42 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-46e34052bb7so61306725e9.2 for ; Tue, 14 Oct 2025 03:43:31 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46fc7abca48sm51133185e9.5.2025.10.14.03.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Oct 2025 03:43:27 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id DF9865F9F7; Tue, 14 Oct 2025 11:43:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760438609; x=1761043409; 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=r45X5ko4sE/c2FtYGn13TPAX2fRw1g2ckflTuGJ2jhY=; b=GWTswMGChT0bXaqk2l8yXpsVIJ5uOKsm18oyE4bWZU071aGcx3GG0PHb1lCI2THERd o9V46qRSifrsiRIXTgmizVOqCG+puFl9yfNjdWjeASalf7LmVE0eZ1isbzwd9Y4DOycJ cGZVr0/eE8Xn9qw/AKiGN4BC2vBFfOgz8T2MUGfXQNS3A9ELVZufcx7/hunKrYLEinE1 4DAyIFlBlR+V3B7LDDq4A+I4hNv0ixmS9SpdOv8BmHjhYWeRK7ng5tcDCz5tZdXfKf1C xLtNRhRJ4fO97eEv1Sg+FByRhpXdIVfQPOkW611FK4dmU/16U8kNK0xvVtWfEYdDVcnA Df+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760438609; x=1761043409; 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=r45X5ko4sE/c2FtYGn13TPAX2fRw1g2ckflTuGJ2jhY=; b=GPwGqq4MssqFRC0yiQlt3FwSSmwwoMHPKANTPZ52vHA/zNTwBGQZHZyphsWIpP8pQV Bm6v+RaxLJg8h9/E8W2ofE7/FgCBm8GF25c2op0VdajGR6mKczaUdzkSpjsOBeKRQp+L mXKmSeEHGby/gEymG0BrSjEIstOrAM+cpo0mSfbjURfSCBnMooieKvmlFDofpqjynKsj SuNsLB0pVTQFk1b3CkHRyCSsB6SyIA5e29QgKiHI146hDjYZPPlyzm0M8v2Ksvb6YIgd FPJp+VsKG8WNOn477c19mOULQJHcx5Y8UUg97WHp900bMPOlCT8UbuAoYpqrGnMf1YWM 7Erg== X-Gm-Message-State: AOJu0YxADk+Ga3P06ZRiHV8x5FwjBDgoPFLnQIPzwVCgCjtqh3lAHZPF zT7oPeFUpQwIgSeLAWrCOr9oTO9OZzS9lFq57udgqxJXtsB0CPg09Xoy+BkGQKUoY1pp4Ztv6Pg LEtX3 X-Gm-Gg: ASbGnct3vYLx0HY3TWA6/Oe2GRMl9dR2BZb2KbrFFU7/ino68sHpVG19QMGrPflksO/ AudWj7XqdcyXPyRanIQsQakYC0tUjcfBSek1h9SIOYsaz9ZVq+GB6JvDtezWqyo+zJTcSJsvAoF VzC8gzQ/sdKnLOI5lumpOGmjn54CrDX+5QGekdzFwBzUexhf20NtUDrdZadMDnpxYyJWuP0v/BZ SOTWHKpMDbTN3GEfxxbvjLlbtA9rmvc8wcf6Ke44Iu7638KUqTQKyBdUuFdGN+yvE95zWVrG0pN il7yTLYa9TlJARDeSUSO0v6t1WE9rW8BPbsm1oiorc+GngfqOKmH8sspui4KnnELHsUhP1ujGFW VHW4KuQ1eYa86fbH/ZyPvQcozp/ceRibogz+dFWO9XCDGJtM7C3NdgHjF X-Google-Smtp-Source: AGHT+IF/Rdi0wyw5+KNsYZKCKc+EZcPxPF1mNI0UCjz4hllr7itM2TSi0FYDswTvI+LN/7l1fNmn3A== X-Received: by 2002:a05:600c:6287:b0:46f:b42e:e395 with SMTP id 5b1f17b1804b1-46fb42ee4f3mr103004735e9.38.1760438608987; Tue, 14 Oct 2025 03:43:28 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Thomas Huth , qemu-arm@nongnu.org, Gustavo Romero , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , BALATON Zoltan , qemu-s390x@nongnu.org Subject: [PATCH 5/5] scripts/setup: update build-environment to use armhf yaml (!WIP) Date: Tue, 14 Oct 2025 11:43:22 +0100 Message-ID: <20251014104323.3023714-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251014104323.3023714-1-alex.bennee@linaro.org> References: <20251014104323.3023714-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760438688675158500 Now we have properly updated our yaml to contain just the cross packages lets injest that in the build-environment script. Signed-off-by: Alex Benn=C3=A9e --- TODO - currently I hand hack some packages that won't install out. --- scripts/ci/setup/ubuntu/build-environment.yml | 22 +++++++++---------- .../ci/setup/ubuntu/ubuntu-2404-armhf.yaml | 2 -- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/set= up/ubuntu/build-environment.yml index 6042750cb4d..f84157dc655 100644 --- a/scripts/ci/setup/ubuntu/build-environment.yml +++ b/scripts/ci/setup/ubuntu/build-environment.yml @@ -47,19 +47,19 @@ - ansible_facts['distribution'] =3D=3D 'Ubuntu' - ansible_facts['distribution_version'] =3D=3D '24.04' =20 + # the package lists are updated by "make lcitool-refresh" + - name: Include the armhf package lists based on OS and architecture + include_vars: + file: "ubuntu-2404-armhf.yaml" + name: armhf_packages + when: + - ansible_facts['distribution'] =3D=3D 'Ubuntu' + - ansible_facts['distribution_version'] =3D=3D '24.04' + - ansible_facts['architecture'] =3D=3D 'aarch64' + - name: Install armhf cross-compile packages to build QEMU on AArch64 = Ubuntu 24.04 package: - name: - - binutils-arm-linux-gnueabihf - - gcc-arm-linux-gnueabihf - - libblkid-dev:armhf - - libc6-dev:armhf - - libffi-dev:armhf - - libglib2.0-dev:armhf - - libmount-dev:armhf - - libpcre2-dev:armhf - - libpixman-1-dev:armhf - - zlib1g-dev:armhf + name: "{{ armhf_packages.packages }}" when: - ansible_facts['distribution'] =3D=3D 'Ubuntu' - ansible_facts['distribution_version'] =3D=3D '24.04' diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml b/scripts/ci/se= tup/ubuntu/ubuntu-2404-armhf.yaml index f06f95514bd..e361357a0ea 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml @@ -19,7 +19,6 @@ packages: - libcapstone-dev:armhf - libcbor-dev:armhf - libcmocka-dev:armhf - - libcurl4-gnutls-dev:armhf - libdaxctl-dev:armhf - libdrm-dev:armhf - libepoxy-dev:armhf @@ -29,7 +28,6 @@ packages: - libgbm-dev:armhf - libgcrypt20-dev:armhf - libglib2.0-dev:armhf - - libglusterfs-dev:armhf - libgnutls28-dev:armhf - libgtk-3-dev:armhf - libgtk-vnc-2.0-dev:armhf --=20 2.47.3