From: Simon McVittie <smcv@collabora.com>
Date: Tue, 8 Aug 2023 11:07:09 +0000 (+0100)
Subject: CI: Install systemd system and user units into our ${prefix}
X-Git-Tag: dbus-1.15.8~13^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e4dd491bb7a30e9b3327bb1aaa237459c4dd6cf;p=thirdparty%2Fdbus.git

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 a248cbddd..d53b8bb42 100755
--- 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)