ci: Build xkbcomp 1.4.1 for the docker image
This is a requirement for testing meson dist in CI.
This commit is contained in:
parent
9716c4193f
commit
099eb6261c
|
@ -11,7 +11,7 @@ variables:
|
||||||
UPSTREAM_REPO: xorg/xserver
|
UPSTREAM_REPO: xorg/xserver
|
||||||
FDO_DISTRIBUTION_VERSION: buster-slim
|
FDO_DISTRIBUTION_VERSION: buster-slim
|
||||||
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
|
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
|
||||||
FDO_DISTRIBUTION_TAG: "2020-11-16"
|
FDO_DISTRIBUTION_TAG: "2021-01-19-xkbcomp"
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- project: 'freedesktop/ci-templates'
|
- project: 'freedesktop/ci-templates'
|
||||||
|
|
|
@ -94,7 +94,6 @@ apt-get install -y \
|
||||||
python3-mako \
|
python3-mako \
|
||||||
python3-numpy \
|
python3-numpy \
|
||||||
python3-six \
|
python3-six \
|
||||||
x11-xkb-utils \
|
|
||||||
x11proto-dev \
|
x11proto-dev \
|
||||||
xfonts-utils \
|
xfonts-utils \
|
||||||
xkb-data \
|
xkb-data \
|
||||||
|
@ -153,6 +152,14 @@ echo 'path=/root/xts' >> piglit/piglit.conf
|
||||||
find -name \*.a -o -name \*.o -o -name \*.c -o -name \*.h -o -name \*.la\* | xargs rm
|
find -name \*.a -o -name \*.o -o -name \*.c -o -name \*.h -o -name \*.la\* | xargs rm
|
||||||
strip xts/xts5/*/.libs/*
|
strip xts/xts5/*/.libs/*
|
||||||
|
|
||||||
|
# Running meson dist requires xkbcomp 1.4.1 or newer, but Debian buster has 1.4.0 only
|
||||||
|
git clone https://gitlab.freedesktop.org/xorg/app/xkbcomp.git --depth 1 --branch=xkbcomp-1.4.1
|
||||||
|
cd xkbcomp
|
||||||
|
./autogen.sh --datarootdir=/usr/share
|
||||||
|
make -j${FDO_CI_CONCURRENT:-4} install
|
||||||
|
cd ..
|
||||||
|
rm -rf xkbcomp
|
||||||
|
|
||||||
apt-get purge -y \
|
apt-get purge -y \
|
||||||
$EPHEMERAL
|
$EPHEMERAL
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user