]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: Ensure that distribution packages own systemenvgeneratordir
authorDebarshi Ray <debarshir@gnome.org>
Fri, 2 May 2025 19:08:55 +0000 (21:08 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 14 May 2025 20:33:39 +0000 (21:33 +0100)
Currently, Fedora's systemd RPM doesn't own systemenvgeneratordir
(ie., /usr/lib/systemd/system-environment-generators) [1] because it's
not created when systemd is installed.  In contrast, userenvgeneratordir
(ie., /usr/lib/systemd/user-environment-generators) is created, unless
the environment-d Meson option is explicitly disabled.

While this can be worked around elsewhere, it's better if the upstream
build system created the directories consistently.  It will avoid
repetition, and prevent silly bugs or deviations from creeping in.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=2284085

(cherry picked from commit ab46feb3e28eee0b9be3dece49f5e4c63f21dc37)

src/core/meson.build

index 84cade9ae7500d66208406ef80a9fa0b1d3135df..3ebadc8f67d6936bf638c1e8026bd0d38387c0c3 100644 (file)
@@ -252,9 +252,11 @@ install_data('org.freedesktop.systemd1.conf',
 install_data('org.freedesktop.systemd1.service',
              install_dir : dbussystemservicedir)
 
+install_emptydir(systemenvgeneratordir)
 install_emptydir(systemshutdowndir)
 install_emptydir(systemsleepdir)
 install_emptydir(systemgeneratordir)
+install_emptydir(userenvgeneratordir)
 install_emptydir(usergeneratordir)
 
 if install_sysconfdir