Compare commits

..

No commits in common. "d5da3ada8eb1f2846b444464ee033020b07b7ea0" and "120b5c0bbead6f635eeebce0a47ec5a777560f74" have entirely different histories.

3 changed files with 3 additions and 42 deletions

View File

@ -85,8 +85,6 @@ if rootprefixdir == ''
endif endif
rootprefixdir_noslash = rootprefixdir == '/' ? '' : rootprefixdir rootprefixdir_noslash = rootprefixdir == '/' ? '' : rootprefixdir
have_standalone_binaries = get_option('standalone-binaries')
sysvinit_path = get_option('sysvinit-path') sysvinit_path = get_option('sysvinit-path')
sysvrcnd_path = get_option('sysvrcnd-path') sysvrcnd_path = get_option('sysvrcnd-path')
conf.set10('HAVE_SYSV_COMPAT', sysvinit_path != '' and sysvrcnd_path != '', conf.set10('HAVE_SYSV_COMPAT', sysvinit_path != '' and sysvrcnd_path != '',
@ -1637,7 +1635,6 @@ subdir('src/nspawn')
subdir('src/resolve') subdir('src/resolve')
subdir('src/timedate') subdir('src/timedate')
subdir('src/timesync') subdir('src/timesync')
subdir('src/tmpfiles')
subdir('src/vconsole') subdir('src/vconsole')
subdir('src/boot/efi') subdir('src/boot/efi')
@ -2934,26 +2931,14 @@ if conf.get('ENABLE_SYSUSERS') == 1
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,
install : true, install : true,
install_dir : rootbindir) install_dir : rootbindir)
if have_standalone_binaries
public_programs += executable(
'systemd-sysusers.standalone',
'src/sysusers/sysusers.c',
include_directories : includes,
link_with : [libshared_static,
libbasic,
libbasic_gcrypt,
libsystemd_static,
libjournal_client],
install : true,
install_dir : rootbindir)
endif
endif endif
if conf.get('ENABLE_TMPFILES') == 1 if conf.get('ENABLE_TMPFILES') == 1
exe = executable( exe = executable(
'systemd-tmpfiles', 'systemd-tmpfiles',
systemd_tmpfiles_sources, 'src/tmpfiles/tmpfiles.c',
'src/tmpfiles/offline-passwd.c',
'src/tmpfiles/offline-passwd.h',
include_directories : includes, include_directories : includes,
link_with : [libshared], link_with : [libshared],
dependencies : [libacl], dependencies : [libacl],
@ -2968,21 +2953,6 @@ if conf.get('ENABLE_TMPFILES') == 1
# https://github.com/mesonbuild/meson/issues/2681 # https://github.com/mesonbuild/meson/issues/2681
args : exe.full_path()) args : exe.full_path())
endif endif
if have_standalone_binaries
public_programs += executable(
'systemd-tmpfiles.standalone',
systemd_tmpfiles_sources,
include_directories : includes,
link_with : [libshared_static,
libbasic,
libbasic_gcrypt,
libsystemd_static,
libjournal_client],
dependencies : [libacl],
install : true,
install_dir : rootbindir)
endif
endif endif
if conf.get('ENABLE_HWDB') == 1 if conf.get('ENABLE_HWDB') == 1

View File

@ -26,8 +26,6 @@ option('static-libsystemd', type : 'combo',
option('static-libudev', type : 'combo', option('static-libudev', type : 'combo',
choices : ['false', 'true', 'pic', 'no-pic'], choices : ['false', 'true', 'pic', 'no-pic'],
description : '''install a static library for libudev''') description : '''install a static library for libudev''')
option('standalone-binaries', type : 'boolean', value : 'false',
description : '''also build standalone versions of supported binaries''')
option('sysvinit-path', type : 'string', value : '/etc/init.d', option('sysvinit-path', type : 'string', value : '/etc/init.d',
description : 'the directory where the SysV init scripts are located') description : 'the directory where the SysV init scripts are located')

View File

@ -1,7 +0,0 @@
# SPDX-License-Identifier: LGPL-2.1+
systemd_tmpfiles_sources = [
'src/tmpfiles/tmpfiles.c',
'src/tmpfiles/offline-passwd.c',
'src/tmpfiles/offline-passwd.h',
]