diff options
| author | Leo Liu <leo.liu@amd.com> | 2021-04-11 11:02:19 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-12 17:33:32 +0000 |
| commit | a99d77e5beb21f1066a30bc9562e4402fc918571 (patch) | |
| tree | ed82d11c0db455281f8c9403aaa37c0986b97899 /.gitlab-ci | |
| parent | 2c1e4c4baa81caa876d387d3c9ced7d0e8ed33d6 (diff) | |
ci: Fix meson-i386 build failed after libdrm bump version
libpciaccess-dev:$arch from STABLE_EPHEMERAL down to the main list of packages
in .gitlab-ci/container/cross_build.sh, and bumping the arm_build, i386_build,
ppc64el_build & s390x_build tags again.
Signed-off-by: Leo Liu <leo.liu@amd.com>
Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
----
.gitlab-ci.yml | 8 ++++----
.gitlab-ci/container/cross_build.sh | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10095>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/cross_build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh index 15d28b1acc8..5f6c52381a3 100644 --- a/.gitlab-ci/container/cross_build.sh +++ b/.gitlab-ci/container/cross_build.sh @@ -7,7 +7,6 @@ export DEBIAN_FRONTEND=noninteractive # Ephemeral packages (installed for this script and removed again at the end) STABLE_EPHEMERAL=" \ - libpciaccess-dev:$arch " dpkg --add-architecture $arch @@ -19,6 +18,7 @@ apt-get install -y --no-remove \ libelf-dev:$arch \ libexpat1-dev:$arch \ libffi-dev:$arch \ + libpciaccess-dev:$arch \ libstdc++6:$arch \ libtinfo-dev:$arch \ libvulkan-dev:$arch \ |