From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
qemu-arm@nongnu.org, "Gustavo Romero" <gustavo.romero@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"BALATON Zoltan" <balaton@eik.bme.hu>,
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 [thread overview]
Message-ID: <20251014104323.3023714-6-alex.bennee@linaro.org> (raw)
In-Reply-To: <20251014104323.3023714-1-alex.bennee@linaro.org>
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ée <alex.bennee@linaro.org>
---
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/setup/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'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '24.04'
+ # 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'] == 'Ubuntu'
+ - ansible_facts['distribution_version'] == '24.04'
+ - ansible_facts['architecture'] == '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'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '24.04'
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-armhf.yaml b/scripts/ci/setup/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
--
2.47.3
next prev parent reply other threads:[~2025-10-14 10:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-14 10:43 [PATCH 0/5] testing/next - arm custom runner tweaks Alex Bennée
2025-10-14 10:43 ` [PATCH 1/5] tests/lcitool: bump to latest version and regenerate (!wait on upstream) Alex Bennée
2025-10-14 10:43 ` [PATCH 2/5] gitlab: use template for ubuntu-24.04-aarch64 jobs Alex Bennée
2025-10-14 10:43 ` [PATCH 3/5] gitlab: modernise the ubuntu24.04-aarch32 jobs Alex Bennée
2025-10-14 10:43 ` [PATCH 4/5] scripts/setup: update the armhf overlay Alex Bennée
2025-10-14 10:43 ` Alex Bennée [this message]
2025-10-14 10:47 ` [PATCH 0/5] testing/next - arm custom runner tweaks Thomas Huth
2025-10-14 17:29 ` Alex Bennée
2025-10-14 17:53 ` Richard Henderson
2025-10-14 18:19 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251014104323.3023714-6-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=balaton@eik.bme.hu \
--cc=gustavo.romero@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).