diff options
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .gitlab-ci/container/arm_build.sh | 6 | ||||
| -rw-r--r-- | .gitlab-ci/container/cross_build.sh | 6 | ||||
| -rw-r--r-- | .gitlab-ci/container/x86_build.sh | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d877f53ed2..82a2abf939a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -221,7 +221,7 @@ x86_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &x86_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &x86_build "2020-07-10" .use-x86_build: variables: @@ -235,7 +235,7 @@ i386_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &i386_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &i386_build "2020-07-10" .use-i386_build: variables: @@ -249,7 +249,7 @@ ppc64el_build: extends: - .use-x86_build-base variables: - FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-06-02" + FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-07-10" .use-ppc64el_build: variables: @@ -321,7 +321,7 @@ arm_build: - .fdo.container-build@debian@arm64v8 - .container variables: - FDO_DISTRIBUTION_TAG: &arm_build "2020-07-07" + FDO_DISTRIBUTION_TAG: &arm_build "2020-07-10" .use-arm_build: variables: diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh index dd0be655d9e..706c2131418 100644 --- a/.gitlab-ci/container/arm_build.sh +++ b/.gitlab-ci/container/arm_build.sh @@ -48,10 +48,10 @@ arch=armhf . .gitlab-ci/container/container_pre_build.sh # dependencies where we want a specific version -export LIBDRM_VERSION=libdrm-2.4.100 +export LIBDRM_VERSION=libdrm-2.4.102 -wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2 -tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2 +wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz +tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz cd $LIBDRM_VERSION; meson build -D vc4=true -D freedreno=true -D etnaviv=true; ninja -C build install; cd .. rm -rf $LIBDRM_VERSION diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh index d088abd3f28..c3e43937410 100644 --- a/.gitlab-ci/container/cross_build.sh +++ b/.gitlab-ci/container/cross_build.sh @@ -39,10 +39,10 @@ apt-get install -y --no-remove -t buster-backports \ # dependencies where we want a specific version -export LIBDRM_VERSION=libdrm-2.4.100 +export LIBDRM_VERSION=libdrm-2.4.102 -wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2 -tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2 +wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz +tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz cd $LIBDRM_VERSION meson --cross-file=/cross_file-${arch}.txt build -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH) ninja -C build install diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh index 562bde8a6b9..9f616538e36 100644 --- a/.gitlab-ci/container/x86_build.sh +++ b/.gitlab-ci/container/x86_build.sh @@ -54,7 +54,7 @@ export XCB_RELEASES=https://xcb.freedesktop.org/dist export WAYLAND_RELEASES=https://wayland.freedesktop.org/releases export XORGMACROS_VERSION=util-macros-1.19.0 -export LIBDRM_VERSION=libdrm-2.4.100 +export LIBDRM_VERSION=libdrm-2.4.102 export XCBPROTO_VERSION=xcb-proto-1.13 export LIBXCB_VERSION=libxcb-1.13 export LIBWAYLAND_VERSION=wayland-1.15.0 @@ -75,8 +75,8 @@ tar -xvf $LIBXCB_VERSION.tar.bz2 && rm $LIBXCB_VERSION.tar.bz2 cd $LIBXCB_VERSION; ./configure; make install; cd .. rm -rf $LIBXCB_VERSION -wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2 -tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2 +wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz +tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz cd $LIBDRM_VERSION meson build -D vc4=true -D freedreno=true -D etnaviv=true -D libdir=lib/x86_64-linux-gnu; ninja -C build install cd .. |