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

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>

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index a248cbddd60c0f19ab7b89a47ea006937d9cc0c7..d53b8bb4201531de7f38f2e496606467f8bc70f7 100755 (executable)
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -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)