diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2024-04-26 16:39:36 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2024-04-30 06:21:47 +0200 |
| commit | 83561896ac9d1ffbc872293ff449b7df79c6c667 (patch) | |
| tree | fcf9c50ca7f7da322da700e6aef528714085e763 | |
| parent | e40e129922a1114c05c846b094aa13496394613b (diff) | |
| download | qemu-83561896ac9d1ffbc872293ff449b7df79c6c667.zip qemu-83561896ac9d1ffbc872293ff449b7df79c6c667.tar.gz qemu-83561896ac9d1ffbc872293ff449b7df79c6c667.tar.bz2 | |
build-environment: make some packages optional
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>
| -rw-r--r-- | scripts/ci/setup/build-environment.yml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml index f344d1a..de0d866 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: |