Skip to content

Commit

Permalink
gitlab: remove stale s390x-all-linux-static conf hacks
Browse files Browse the repository at this point in the history
The libssh bug references 18.04 which we are no longer running. We
don't need to disable glusterfs because a linux-user build shouldn't
be trying to link to it anyway.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240426153938.1707723-4-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 108d997 commit 39ad72c
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ ubuntu-22.04-s390x-all-linux-static:
- if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
- if: "$S390X_RUNNER_AVAILABLE"
script:
# --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763
# --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages
- mkdir build
- cd build
- ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh
- ../configure --enable-debug --static --disable-system
|| { cat config.log meson-logs/meson-log.txt; exit 1; }
- make --output-sync -j`nproc`
- make --output-sync check-tcg
Expand Down

0 comments on commit 39ad72c

Please sign in to comment.