[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/19] build-environment: make some packages optional
From: |
Thomas Huth |
Subject: |
[PULL 13/19] build-environment: make some packages optional |
Date: |
Tue, 30 Apr 2024 09:13:34 +0200 |
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
- [PULL 00/19] Misc patches (s390x clean-ups, fixes for crashes, ...), Thomas Huth, 2024/04/30
- [PULL 01/19] target/s390x/cpu_model: Make check_compatibility() return boolean, Thomas Huth, 2024/04/30
- [PULL 04/19] target/s390x/cpu_models: Drop local @err in get_max_cpu_model(), Thomas Huth, 2024/04/30
- [PULL 05/19] target/s390x/cpu_models: Make kvm_s390_apply_cpu_model() return boolean, Thomas Huth, 2024/04/30
- [PULL 06/19] target/s390x/cpu_models_sysemu: Drop local @err in apply_cpu_model(), Thomas Huth, 2024/04/30
- [PULL 07/19] hw: misc: edu: fix 2 off-by-one errors, Thomas Huth, 2024/04/30
- [PULL 02/19] target/s390x/cpu_model: Drop local @err in s390_realize_cpu_model(), Thomas Huth, 2024/04/30
- [PULL 03/19] target/s390x/cpu_models: Make kvm_s390_get_host_cpu_model() return boolean, Thomas Huth, 2024/04/30
- [PULL 09/19] hw: misc: edu: use qemu_log_mask instead of hw_error, Thomas Huth, 2024/04/30
- [PULL 08/19] hw: misc: edu: rename local vars in edu_check_range, Thomas Huth, 2024/04/30
- [PULL 13/19] build-environment: make some packages optional,
Thomas Huth <=
- [PULL 14/19] gitlab: migrate the s390x custom machine to 22.04, Thomas Huth, 2024/04/30
- [PULL 12/19] hw/char/stm32l4x5_usart: Fix memory corruption by adding correct class_size, Thomas Huth, 2024/04/30
- [PULL 11/19] qga: Re-enable the qga-ssh-test when running without fuzzing, Thomas Huth, 2024/04/30
- [PULL 15/19] gitlab: remove stale s390x-all-linux-static conf hacks, Thomas Huth, 2024/04/30
- [PULL 16/19] hw/ide/core.c (cmd_read_native_max): Avoid limited device parameters, Thomas Huth, 2024/04/30
- [PULL 10/19] stubs: Add missing qga stubs, Thomas Huth, 2024/04/30
- [PULL 18/19] .gitlab-ci.d/cirrus.yml: Shorten the runtime of the macOS and FreeBSD jobs, Thomas Huth, 2024/04/30
- [PULL 17/19] tests/qtest/ide-test: Verify READ NATIVE MAX ADDRESS is not limited, Thomas Huth, 2024/04/30
- [PULL 19/19] .gitlab-ci.d/cirrus: Remove the netbsd and openbsd jobs, Thomas Huth, 2024/04/30
- Re: [PULL 00/19] Misc patches (s390x clean-ups, fixes for crashes, ...), Richard Henderson, 2024/04/30