Skip to content

Commit

Permalink
build-environment: make some packages optional
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
stsquad authored and huth committed Apr 30, 2024
1 parent e40e129 commit 8356189
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions scripts/ci/setup/build-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
- libpam0g-dev
- libpcre2-dev
- libpixman-1-dev
- libpmem-dev
- libpng-dev
- libpulse-dev
- librbd-dev
Expand All @@ -107,7 +106,6 @@
- libslirp-dev
- libsnappy-dev
- libspice-protocol-dev
- libspice-server-dev
- libssh-dev
- libsystemd-dev
- libtasn1-6-dev
Expand All @@ -119,7 +117,6 @@
- libvdeplug-dev
- libvirglrenderer-dev
- libvte-2.91-dev
- libxen-dev
- libxml2-dev
- libzstd-dev
- llvm
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 8356189

Please sign in to comment.