File OPENSUSE-0007-build-drop-build-time-systemd-dep... of Package lxc

Overview Repositories Revisions Requests Users Attributes Meta

File OPENSUSE-0007-build-drop-build-time-systemd-dependency.patch of Package lxc (Revision 1ce5d97cd4c2ed2fa1bd11594325045c)

Currently displaying revision 1ce5d97cd4c2ed2fa1bd11594325045c , Show latest

From 1d5c7e771c036e72a1c516f49b7d7aa1a9da4bb7 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <cyphar@cyphar.com>
Date: Fri, 28 Oct 2022 12:58:10 +1100
Subject: [PATCH 7/7] build: drop build-time systemd dependency

On openSUSE, our packages are build in the Open Build Service which does
not have a proper systemd installation that you can query to get the
systemdunitdir.

The simplest solution is to re-add the ability to explicitly set the
systemdunitdir (as was previously possible with the autotools build
system in pre-5.0 LXC).

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
---
 config/init/systemd/meson.build | 7 +++++--
 meson_options.txt               | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/init/systemd/meson.build b/config/init/systemd/meson.build
index 21e75650404d..7419010167b8 100644
--- a/config/init/systemd/meson.build
+++ b/config/init/systemd/meson.build
@@ -8,8 +8,11 @@ lxc_apparmor_load = configure_file(
     install_dir: lxclibexec)
 
 if 'systemd' in init_script
-    systemd = dependency('systemd')
-    systemd_system_unit_dir = systemd.get_variable('systemdsystemunitdir')
+    systemd_system_unit_dir = get_option('systemd-unitdir')
+    if systemd_system_unit_dir == ''
+        systemd = dependency('systemd')
+        systemd_system_unit_dir = systemd.get_variable('systemdsystemunitdir')
+    endif
 
     configure_file(
         configuration: conf,
diff --git a/meson_options.txt b/meson_options.txt
index 7aefa2bd2e5b..9803473d2f3c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -18,6 +18,11 @@ option('init-script', type : 'array',
        choices : ['systemd', 'sysvinit', 'upstart'], value : ['systemd'],
        description : 'init script')
 
+# was --systemd-unidir in autotools
+# If set to "", the value is taken from the running systemd instance.
+option('systemd-unitdir', type : 'string', value: '',
+       description : 'systemd system unit directory')
+
 # was --{disable,enable}-liburing in autotools
 option('io-uring-event-loop', type: 'boolean', value: 'false',
        description: 'Enable io-uring based event loop')
-- 
2.38.0

Places

File OPENSUSE-0007-build-drop-build-time-systemd-dependency.patch of Package lxc (Revision 1ce5d97cd4c2ed2fa1bd11594325045c)

Places