shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-05 13:18:06 +03:00
Code

build: only install tmpfiles.d/systemd-remote.conf when necessary (#6051)

Browse Source 
Also only include the relevant parts for systemd-journal-remote and
systemd-journal-upload when needed.
This commit is contained in:
Franck Bui 2017-05-30 17:03:25 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 9d8813b3b4
commit 5e354b2252
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -2676,6 +2676,7 @@ nodist_systemunit_DATA += \
nodist_tmpfiles_DATA = \ nodist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \ tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-remote.conf \
tmpfiles.d/var.conf \ tmpfiles.d/var.conf \
tmpfiles.d/etc.conf tmpfiles.d/etc.conf
@ -2709,6 +2710,7 @@ endif
EXTRA_DIST += \ EXTRA_DIST += \
tmpfiles.d/systemd.conf.m4 \ tmpfiles.d/systemd.conf.m4 \
tmpfiles.d/systemd-remote.conf.m4 \
tmpfiles.d/etc.conf.m4 \ tmpfiles.d/etc.conf.m4 \
tmpfiles.d/var.conf.m4 \ tmpfiles.d/var.conf.m4 \
units/systemd-tmpfiles-setup-dev.service.in \ units/systemd-tmpfiles-setup-dev.service.in \
@ -4331,11 +4333,6 @@ systemd_journal_remote_CFLAGS = \
systemd_journal_remote_LDADD += \ systemd_journal_remote_LDADD += \
$(MICROHTTPD_LIBS) $(MICROHTTPD_LIBS)
if ENABLE_TMPFILES
dist_tmpfiles_DATA += \
tmpfiles.d/systemd-remote.conf
endif
if HAVE_GNUTLS if HAVE_GNUTLS
systemd_journal_remote_LDADD += \ systemd_journal_remote_LDADD += \
$(GNUTLS_LIBS) $(GNUTLS_LIBS)
@ -4364,6 +4361,13 @@ EXTRA_DIST += \
src/journal-remote/log-generator.py src/journal-remote/log-generator.py
endif endif
if HAVE_REMOTE
if ENABLE_TMPFILES
dist_tmpfiles_DATA += \
tmpfiles.d/systemd-remote.conf
endif
endif
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
journalctl_CFLAGS = \ journalctl_CFLAGS = \
$(AM_CFLAGS) $(AM_CFLAGS)

26
tmpfiles.d/meson.build
View File

@ -4,7 +4,6 @@ tmpfiles = [['home.conf', ''],
['journal-nocow.conf', ''], ['journal-nocow.conf', ''],
['systemd-nologin.conf', ''], ['systemd-nologin.conf', ''],
['systemd-nspawn.conf', ''], ['systemd-nspawn.conf', ''],
['systemd-remote.conf', 'ENABLE_REMOTE'],
['tmp.conf', ''], ['tmp.conf', ''],
['x11.conf', ''], ['x11.conf', ''],
['legacy.conf', 'HAVE_SYSV_COMPAT'], ['legacy.conf', 'HAVE_SYSV_COMPAT'],
@ -21,19 +20,28 @@ foreach pair : tmpfiles
endif endif
endforeach endforeach
m4_files = ['etc.conf', m4_files = [['etc.conf', ''],
'systemd.conf', ['systemd.conf', ''],
'var.conf'] ['systemd-remote.conf', 'ENABLE_REMOTE'],
['var.conf', ''],
]
foreach file : m4_files foreach pair : m4_files
if not enable_tmpfiles
# do nothing
elif pair[1] == '' or conf.get(pair[1], false)
custom_target( custom_target(
'tmpfiles.d/' + file, 'tmpfiles.d/' + pair[0],
input : file + '.m4', input : pair[0] + '.m4',
output: file, output: pair[0],
command : [m4, '-P'] + m4_defines + ['@INPUT@'], command : [m4, '-P'] + m4_defines + ['@INPUT@'],
capture : true, capture : true,
install : enable_tmpfiles, install : true,
install_dir : tmpfilesdir) install_dir : tmpfilesdir)
else
message('Not installing tmpfiles.d/@0@.m4 because @1@ is @2@'
.format(pair[0], pair[1], conf.get(pair[1], 0)))
endif
endforeach endforeach
if enable_tmpfiles if enable_tmpfiles

4
tmpfiles.d/systemd-remote.conf → tmpfiles.d/systemd-remote.conf.m4
View File

@ -6,8 +6,12 @@
# (at your option) any later version. # (at your option) any later version.
# See tmpfiles.d(5) for details # See tmpfiles.d(5) for details
m4_ifdef(`HAVE_LIBCURL',
d /var/lib/systemd/journal-upload 0755 systemd-journal-upload systemd-journal-upload - - d /var/lib/systemd/journal-upload 0755 systemd-journal-upload systemd-journal-upload - -
)m4_dnl
m4_ifdef(`HAVE_MICROHTTPD',
z /var/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - - z /var/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - -
z /run/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - - z /run/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - -
)m4_dnl