ci: upgrade seatd to 0.6
This upgrades seatd to the latest version. Examples are disabled by default. Man pages are already disabled by auto_features=disabled. Other build options have been renamed. Signed-off-by: Simon Ser <contact@emersion.fr>
This commit is contained in:
parent
a2a8d382e3
commit
eb347687e7
@ -3,7 +3,7 @@
|
||||
.templates_sha: &template_sha 567700e483aabed992d0a4fea84994a0472deff6 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
||||
# This file uses the freedesktop ci-templates to build Weston and run our
|
||||
# tests in CI.
|
||||
#
|
||||
#
|
||||
# ci-templates uses a multi-stage build process. First, the base container
|
||||
# image is built which contains the core distribution, the toolchain, and
|
||||
# all our build dependencies. This container is aggressively cached; if a
|
||||
@ -43,7 +43,7 @@
|
||||
variables:
|
||||
FDO_UPSTREAM_REPO: wayland/weston
|
||||
FDO_REPO_SUFFIX: "$BUILD_OS/$BUILD_ARCH"
|
||||
FDO_DISTRIBUTION_TAG: '2021-08-13.0-replace-kvmconfig'
|
||||
FDO_DISTRIBUTION_TAG: '2021-09-14.2'
|
||||
|
||||
|
||||
include:
|
||||
@ -334,7 +334,7 @@ docs-build:
|
||||
-Dpipewire=false
|
||||
-Dwerror=true
|
||||
-Dlauncher-libseat=true
|
||||
|
||||
|
||||
x86_64-debian-no-gl-build:
|
||||
extends:
|
||||
- .test-env-debian-x86_64
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
#
|
||||
# Builds the dependencies required for any OS/architecture combination. See
|
||||
# .gitlab-ci.yml for more information. This script is called from an
|
||||
# OS-specific build scripts like debian-install.sh.
|
||||
@ -31,7 +31,7 @@ pip3 install sphinx_rtd_theme==0.4.3 --user
|
||||
# version here so we see predictable results.
|
||||
#
|
||||
# To run this we use virtme, a QEMU wrapper: https://github.com/amluto/virtme
|
||||
#
|
||||
#
|
||||
# virtme makes our lives easier by abstracting handling of the console,
|
||||
# filesystem, etc, so we can pretend that the VM we execute in is actually
|
||||
# just a regular container.
|
||||
@ -148,11 +148,10 @@ rm -rf pipewire
|
||||
# seatd lets us avoid the pain of handling VTs manually through weston-launch
|
||||
# or open-coding TTY assignment within Weston. We use this for our tests using
|
||||
# the DRM backend.
|
||||
git clone --depth=1 --branch 0.5.0 https://git.sr.ht/~kennylevinsen/seatd
|
||||
git clone --depth=1 --branch 0.6.1 https://git.sr.ht/~kennylevinsen/seatd
|
||||
cd seatd
|
||||
meson build -Dauto_features=disabled \
|
||||
-Dseatd=enabled -Dlogind=enabled -Dserver=enabled \
|
||||
-Dexamples=disabled -Dman-pages=disabled
|
||||
-Dlibseat-seatd=enabled -Dlibseat-logind=systemd -Dserver=enabled
|
||||
ninja ${NINJAFLAGS} -C build install
|
||||
cd ..
|
||||
rm -rf seatd
|
||||
|
Loading…
Reference in New Issue
Block a user