From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 13/19] build-environment: make some packages optional
Date: Tue, 30 Apr 2024 09:13:34 +0200 [thread overview]
Message-ID: <20240430071340.413305-14-thuth@redhat.com> (raw)
In-Reply-To: <20240430071340.413305-1-thuth@redhat.com>
From: Alex Bennée <alex.bennee@linaro.org>
Upgrading the s390x runner exposed some packages are not available for
it. Add an additional optional stage we only enable for arm64/x86_64
for now.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240426153938.1707723-2-alex.bennee@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
scripts/ci/setup/build-environment.yml | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index f344d1a850..de0d866a1e 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -95,7 +95,6 @@
- libpam0g-dev
- libpcre2-dev
- libpixman-1-dev
- - libpmem-dev
- libpng-dev
- libpulse-dev
- librbd-dev
@@ -107,7 +106,6 @@
- libslirp-dev
- libsnappy-dev
- libspice-protocol-dev
- - libspice-server-dev
- libssh-dev
- libsystemd-dev
- libtasn1-6-dev
@@ -119,7 +117,6 @@
- libvdeplug-dev
- libvirglrenderer-dev
- libvte-2.91-dev
- - libxen-dev
- libxml2-dev
- libzstd-dev
- llvm
@@ -156,6 +153,19 @@
- ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_version'] == '22.04'
+ # not all packages are available for all architectures
+ - name: Install additional packages to build QEMU on Ubuntu 22.04
+ package:
+ name:
+ - libpmem-dev
+ - libspice-server-dev
+ - libxen-dev
+ state: present
+ when:
+ - ansible_facts['distribution'] == 'Ubuntu'
+ - ansible_facts['distribution_version'] == '22.04'
+ - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
+
- name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 22.04
package:
name:
--
2.44.0
next prev parent reply other threads:[~2024-04-30 7:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 7:13 [PULL 00/19] Misc patches (s390x clean-ups, fixes for crashes, ...) Thomas Huth
2024-04-30 7:13 ` [PULL 01/19] target/s390x/cpu_model: Make check_compatibility() return boolean Thomas Huth
2024-04-30 7:13 ` [PULL 02/19] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_model() Thomas Huth
2024-04-30 7:13 ` [PULL 03/19] target/s390x/cpu_models: Make kvm_s390_get_host_cpu_model() return boolean Thomas Huth
2024-04-30 7:13 ` [PULL 04/19] target/s390x/cpu_models: Drop local @err in get_max_cpu_model() Thomas Huth
2024-04-30 7:13 ` [PULL 05/19] target/s390x/cpu_models: Make kvm_s390_apply_cpu_model() return boolean Thomas Huth
2024-04-30 7:13 ` [PULL 06/19] target/s390x/cpu_models_sysemu: Drop local @err in apply_cpu_model() Thomas Huth
2024-04-30 7:13 ` [PULL 07/19] hw: misc: edu: fix 2 off-by-one errors Thomas Huth
2024-04-30 7:13 ` [PULL 08/19] hw: misc: edu: rename local vars in edu_check_range Thomas Huth
2024-04-30 7:13 ` [PULL 09/19] hw: misc: edu: use qemu_log_mask instead of hw_error Thomas Huth
2024-04-30 7:13 ` [PULL 10/19] stubs: Add missing qga stubs Thomas Huth
2024-04-30 7:13 ` [PULL 11/19] qga: Re-enable the qga-ssh-test when running without fuzzing Thomas Huth
2024-04-30 7:13 ` [PULL 12/19] hw/char/stm32l4x5_usart: Fix memory corruption by adding correct class_size Thomas Huth
2024-04-30 7:13 ` Thomas Huth [this message]
2024-04-30 7:13 ` [PULL 14/19] gitlab: migrate the s390x custom machine to 22.04 Thomas Huth
2024-04-30 7:13 ` [PULL 15/19] gitlab: remove stale s390x-all-linux-static conf hacks Thomas Huth
2024-04-30 7:13 ` [PULL 16/19] hw/ide/core.c (cmd_read_native_max): Avoid limited device parameters Thomas Huth
2024-04-30 7:13 ` [PULL 17/19] tests/qtest/ide-test: Verify READ NATIVE MAX ADDRESS is not limited Thomas Huth
2024-04-30 7:13 ` [PULL 18/19] .gitlab-ci.d/cirrus.yml: Shorten the runtime of the macOS and FreeBSD jobs Thomas Huth
2024-04-30 7:13 ` [PULL 19/19] .gitlab-ci.d/cirrus: Remove the netbsd and openbsd jobs Thomas Huth
2024-04-30 23:00 ` [PULL 00/19] Misc patches (s390x clean-ups, fixes for crashes, ...) Richard Henderson
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=20240430071340.413305-14-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).