fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-03 11:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CI: Install systemd system and user units into our ${prefix}

Browse source 
This keeps everything we install from CI separate from a possible
OS-level installation in /usr.

Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/470
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2023-08-08 12:07:09 +01:00
parent 4b4aa24919
commit 3e4dd491bb
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/ci-build.sh
View file

@ -427,6 +427,13 @@ case "$ci_buildsys" in
esac
set -- -Dmodular_tests=enabled "$@"
# By default, the Meson build would install these into
# /lib/systemd, overwriting any systemd units that might have
# come from the container's base OS. Install into our prefix instead,
# keeping the CI installation separate from the container's base OS
# while still allowing systemd to see the units. (dbus#470)
set -- -Dsystemd_system_unitdir=/usr/local/lib/systemd/system "$@"
set -- -Dsystemd_user_unitdir=/usr/local/lib/systemd/user "$@"
case "$ci_variant" in
(debug)