summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cb/elogind.cbp13
-rw-r--r--meson.build258
-rw-r--r--src/basic/cgroup-util.c2
-rw-r--r--src/basic/cgroup-util.h6
-rw-r--r--src/basic/fileio.c1
-rw-r--r--src/basic/fs-util.c1
-rw-r--r--src/basic/hexdecoct.c1
-rw-r--r--src/basic/missing_syscall.h2
-rw-r--r--src/basic/mount-util.c2
-rw-r--r--src/basic/mount-util.h2
-rw-r--r--src/basic/parse-util.c1
-rw-r--r--src/basic/process-util.c2
-rw-r--r--src/basic/process-util.h2
-rw-r--r--src/libelogind/meson.build8
-rw-r--r--src/libelogind/sd-bus/sd-bus.c1
-rw-r--r--src/libelogind/sd-daemon/sd-daemon.c1
-rw-r--r--src/libelogind/sd-event/test-event.c1
-rw-r--r--src/login/logind-session.c2
-rw-r--r--src/login/meson.build20
-rw-r--r--src/login/pam_elogind.c1
-rw-r--r--src/shared/meson.build10
-rw-r--r--src/shared/udev-util.c1
-rw-r--r--src/test/meson.build156
-rw-r--r--src/test/test-cgroup.c1
-rw-r--r--src/test/test-hashmap-plain.c4
-rw-r--r--src/test/test-log.c1
-rw-r--r--src/test/test-process-util.c2
-rw-r--r--src/test/test-signal-util.c1
28 files changed, 274 insertions, 229 deletions
diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index 6cb494480..86175400d 100644
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -33,10 +33,9 @@
<Compiler>
<Add option="-Wall" />
</Compiler>
- <Unit filename="../Makefile.am" />
- <Unit filename="../config.h.in" />
- <Unit filename="../configure.ac" />
- <Unit filename="../po/Makefile.in.in" />
+ <Unit filename="../man/meson.build" />
+ <Unit filename="../meson.build" />
+ <Unit filename="../meson_options.txt" />
<Unit filename="../src/basic/alloc-util.c">
<Option compilerVar="CC" />
</Unit>
@@ -162,6 +161,7 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/basic/mempool.h" />
+ <Unit filename="../src/basic/meson.build" />
<Unit filename="../src/basic/missing.h" />
<Unit filename="../src/basic/missing_syscall.h" />
<Unit filename="../src/basic/mkdir-label.c">
@@ -301,6 +301,7 @@
</Unit>
<Unit filename="../src/core/mount-setup.h" />
<Unit filename="../src/libelogind/libelogind.sym" />
+ <Unit filename="../src/libelogind/meson.build" />
<Unit filename="../src/libelogind/sd-bus/bus-bloom.c">
<Option compilerVar="CC" />
</Unit>
@@ -501,6 +502,7 @@
</Unit>
<Unit filename="../src/login/logind.conf.in" />
<Unit filename="../src/login/logind.h" />
+ <Unit filename="../src/login/meson.build" />
<Unit filename="../src/login/pam_elogind.c">
<Option compilerVar="CC" />
</Unit>
@@ -533,6 +535,7 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/shared/conf-parser.h" />
+ <Unit filename="../src/shared/meson.build" />
<Unit filename="../src/shared/musl_missing.c">
<Option compilerVar="CC" />
</Unit>
@@ -579,6 +582,7 @@
<Unit filename="../src/systemd/sd-id128.h" />
<Unit filename="../src/systemd/sd-login.h" />
<Unit filename="../src/systemd/sd-messages.h" />
+ <Unit filename="../src/test/meson.build" />
<Unit filename="../src/test/test-alloc-util.c">
<Option compilerVar="CC" />
</Unit>
@@ -703,6 +707,7 @@
<Unit filename="../src/test/test-verbs.c">
<Option compilerVar="CC" />
</Unit>
+ <Unit filename="../src/update-utmp/meson.build" />
<Unit filename="../src/update-utmp/update-utmp.c">
<Option compilerVar="CC" />
</Unit>
diff --git a/meson.build b/meson.build
index 1d1082d54..b0153adf1 100644
--- a/meson.build
+++ b/meson.build
@@ -695,11 +695,11 @@ substs.set('TTY_GID', tty_gid)
# if get_option('adm-group')
# m4_defines += ['-DENABLE_ADM_GROUP']
# endif
-#
+#
# if get_option('wheel-group')
# m4_defines += ['-DENABLE_WHEEL_GROUP']
# endif
-#
+#
# substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode'))
#endif // 0
@@ -893,7 +893,7 @@ endif
# else
# libmicrohttpd = []
# endif
-#
+#
# want_libcryptsetup = get_option('libcryptsetup')
# if want_libcryptsetup != 'false'
# libcryptsetup = dependency('libcryptsetup',
@@ -903,7 +903,7 @@ endif
# else
# libcryptsetup = []
# endif
-#
+#
# want_libcurl = get_option('libcurl')
# if want_libcurl != 'false'
# libcurl = dependency('libcurl',
@@ -916,13 +916,13 @@ endif
# else
# libcurl = []
# endif
-#
+#
# want_libidn = get_option('libidn')
# want_libidn2 = get_option('libidn2')
# if want_libidn == 'true' and want_libidn2 == 'true'
# error('libidn and libidn2 cannot be requested simultaneously')
# endif
-#
+#
# if want_libidn != 'false' and want_libidn2 != 'true'
# libidn = dependency('libidn',
# required : want_libidn == 'true')
@@ -942,7 +942,7 @@ endif
# m4_defines += ['-DHAVE_LIBIDN2']
# endif
# endif
-#
+#
# want_libiptc = get_option('libiptc')
# if want_libiptc != 'false'
# libiptc = dependency('libiptc',
@@ -954,7 +954,7 @@ endif
# else
# libiptc = []
# endif
-#
+#
# want_qrencode = get_option('qrencode')
# if want_qrencode != 'false'
# libqrencode = dependency('libqrencode',
@@ -963,12 +963,12 @@ endif
# else
# libqrencode = []
# endif
-#
+#
# want_gcrypt = get_option('gcrypt')
# if want_gcrypt != 'false'
# libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true')
# libgpg_error = cc.find_library('gpg-error', required : want_gcrypt == 'true')
-#
+#
# have_deps = libgcrypt.found() and libgpg_error.found()
# conf.set('HAVE_GCRYPT', have_deps)
# if not have_deps
@@ -980,7 +980,7 @@ endif
# libgcrypt = []
# libgpg_error = []
# endif
-#
+#
# want_gnutls = get_option('gnutls')
# if want_gnutls != 'false'
# libgnutls = dependency('gnutls',
@@ -990,7 +990,7 @@ endif
# else
# libgnutls = []
# endif
-#
+#
# want_elfutils = get_option('elfutils')
# if want_elfutils != 'false'
# libdw = dependency('libdw',
@@ -999,7 +999,7 @@ endif
# else
# libdw = []
# endif
-#
+#
# want_zlib = get_option('zlib')
# if want_zlib != 'false'
# libz = dependency('zlib',
@@ -1008,7 +1008,7 @@ endif
# else
# libz = []
# endif
-#
+#
# want_bzip2 = get_option('bzip2')
# if want_bzip2 != 'false'
# libbzip2 = cc.find_library('bz2',
@@ -1017,7 +1017,7 @@ endif
# else
# libbzip2 = []
# endif
-#
+#
# want_xz = get_option('xz')
# if want_xz != 'false'
# libxz = dependency('liblzma',
@@ -1026,7 +1026,7 @@ endif
# else
# libxz = []
# endif
-#
+#
# want_lz4 = get_option('lz4')
# if want_lz4 != 'false'
# liblz4 = dependency('liblz4',
@@ -1035,7 +1035,7 @@ endif
# else
# liblz4 = []
# endif
-#
+#
# want_xkbcommon = get_option('xkbcommon')
# if want_xkbcommon != 'false'
# libxkbcommon = dependency('xkbcommon',
@@ -1100,7 +1100,7 @@ endif
# conf.set('DEFAULT_DNSSEC_MODE',
# 'DNSSEC_' + default_dnssec.underscorify().to_upper())
# substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
-#
+#
# want_importd = get_option('importd')
# if want_importd != 'false'
# have_deps = (conf.get('HAVE_LIBCURL', false) and
@@ -1113,7 +1113,7 @@ endif
# error('importd support was requested, but dependencies are not available')
# endif
# endif
-#
+#
# want_remote = get_option('remote')
# if want_remote != 'false'
# have_deps = [conf.get('HAVE_MICROHTTPD', false),
@@ -1183,7 +1183,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', get_option('slow-tests'))
#if 0 /// UNNEEDED by elogind
# if get_option('efi')
# efi_arch = host_machine.cpu_family()
-#
+#
# if efi_arch == 'x86'
# EFI_MACHINE_TYPE_NAME = 'ia32'
# gnu_efi_arch = 'ia32'
@@ -1200,10 +1200,10 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', get_option('slow-tests'))
# EFI_MACHINE_TYPE_NAME = ''
# gnu_efi_arch = ''
# endif
-#
+#
# conf.set('ENABLE_EFI', true)
# conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
-#
+#
# conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int())
# endif
#endif // 0
@@ -1276,7 +1276,7 @@ subdir('src/login')
# journald_gperf_c,
# include_directories : includes,
# install : false)
-#
+#
# libsystemd_sym_path = '@0@/@1@'.format(meson.current_source_dir(), libsystemd_sym)
# libsystemd = shared_library(
# 'systemd',
@@ -1328,7 +1328,7 @@ subdir('src/shared')
# subdir('src/core')
# subdir('src/udev')
# subdir('src/network')
-#
+#
# subdir('src/analyze')
# subdir('src/journal-remote')
# subdir('src/coredump')
@@ -1362,19 +1362,19 @@ subdir('src/test')
# include_directories : includes,
# link_with : [libbasic],
# dependencies : [libdl])
-#
+#
# foreach tuple : [['myhostname', 'HAVE_MYHOSTNAME'],
# ['systemd', 'ENABLE_NSS_SYSTEMD'],
# ['mymachines', 'ENABLE_MACHINED'],
# ['resolve', 'ENABLE_RESOLVED']]
-#
+#
# condition = tuple[1] == '' or conf.get(tuple[1], false)
# if condition
# module = tuple[0]
-#
+#
# sym = 'src/nss-@0@/nss-@0@.sym'.format(module)
# version_script_arg = join_paths(meson.current_source_dir(), sym)
-#
+#
# nss = shared_library(
# 'nss_' + module,
# 'src/nss-@0@/nss-@0@.c'.format(module),
@@ -1390,13 +1390,13 @@ subdir('src/test')
# link_depends : sym,
# install : true,
# install_dir : rootlibdir)
-#
+#
# # We cannot use shared_module because it does not support version suffix.
# # Unfortunately shared_library insists on creating the symlink…
# meson.add_install_script('sh', '-c',
# 'rm $DESTDIR@0@/libnss_@1@.so'
# .format(rootlibdir, module))
-#
+#
# test('dlopen-nss_' + module,
# test_dlopen,
# args : [nss.full_path()]) # path to dlopen must include a slash
@@ -1421,7 +1421,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('systemd-analyze',
# systemd_analyze_sources,
# include_directories : includes,
@@ -1436,7 +1436,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# executable('systemd-journald',
# systemd_journald_sources,
# include_directories : includes,
@@ -1449,7 +1449,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('systemd-cat',
# systemd_cat_sources,
# include_directories : includes,
@@ -1459,7 +1459,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# exe = executable('journalctl',
# journalctl_sources,
# include_directories : includes,
@@ -1472,7 +1472,7 @@ subdir('src/test')
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# executable('systemd-getty-generator',
# 'src/getty-generator/getty-generator.c',
# include_directories : includes,
@@ -1480,7 +1480,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : systemgeneratordir)
-#
+#
# executable('systemd-debug-generator',
# 'src/debug-generator/debug-generator.c',
# include_directories : includes,
@@ -1488,7 +1488,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : systemgeneratordir)
-#
+#
# executable('systemd-fstab-generator',
# 'src/fstab-generator/fstab-generator.c',
# 'src/core/mount-setup.c',
@@ -1497,7 +1497,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : systemgeneratordir)
-#
+#
# if conf.get('ENABLE_ENVIRONMENT_D', false)
# executable('30-systemd-environment-d-generator',
# 'src/environment-d-generator/environment-d-generator.c',
@@ -1506,12 +1506,12 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : userenvgeneratordir)
-#
+#
# meson.add_install_script(meson_make_symlink,
# join_paths(sysconfdir, 'environment'),
# join_paths(environmentdir, '99-environment.conf'))
# endif
-#
+#
# if conf.get('ENABLE_HIBERNATE', false)
# executable('systemd-hibernate-resume-generator',
# 'src/hibernate-resume/hibernate-resume-generator.c',
@@ -1520,7 +1520,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : systemgeneratordir)
-#
+#
# executable('systemd-hibernate-resume',
# 'src/hibernate-resume/hibernate-resume.c',
# include_directories : includes,
@@ -1529,7 +1529,7 @@ subdir('src/test')
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# if conf.get('HAVE_BLKID', false)
# executable('systemd-gpt-auto-generator',
# 'src/gpt-auto-generator/gpt-auto-generator.c',
@@ -1540,7 +1540,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : systemgeneratordir)
-#
+#
# exe = executable('systemd-dissect',
# 'src/dissect/dissect.c',
# include_directories : includes,
@@ -1550,7 +1550,7 @@ subdir('src/test')
# install_dir : rootlibexecdir)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_RESOLVED', false)
# executable('systemd-resolved',
# systemd_resolved_sources,
@@ -1565,7 +1565,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('systemd-resolve',
# systemd_resolve_sources,
# gcrypt_util_sources,
@@ -1580,7 +1580,7 @@ subdir('src/test')
# install : true)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_LOGIND', false)
# executable('systemd-logind',
# systemd_logind_sources,
@@ -1592,7 +1592,7 @@ subdir('src/test')
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('loginctl',
# loginctl_sources,
# include_directories : includes,
@@ -1604,7 +1604,7 @@ subdir('src/test')
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-inhibit',
# 'src/login/inhibit.c',
# include_directories : includes,
@@ -1613,7 +1613,7 @@ subdir('src/test')
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# if conf.get('HAVE_PAM', false)
# version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym)
# pam_systemd = shared_library(
@@ -1631,7 +1631,7 @@ subdir('src/test')
# link_depends : pam_systemd_sym,
# install : true,
# install_dir : pamlibdir)
-#
+#
# test('dlopen-pam_systemd',
# test_dlopen,
# args : [pam_systemd.full_path()]) # path to dlopen must include a slash
@@ -1701,7 +1701,7 @@ endif
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# if conf.get('ENABLE_EFI', false) and conf.get('HAVE_BLKID', false)
# exe = executable('bootctl',
# 'src/boot/bootctl.c',
@@ -1712,7 +1712,7 @@ endif
# install : true)
# public_programs += [exe]
# endif
-#
+#
# exe = executable('systemd-socket-activate', 'src/activate/activate.c',
# include_directories : includes,
# link_with : [libshared],
@@ -1720,7 +1720,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# exe = executable('systemctl', 'src/systemctl/systemctl.c',
# include_directories : includes,
# link_with : [libshared],
@@ -1733,7 +1733,7 @@ endif
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# if conf.get('ENABLE_BACKLIGHT', false)
# executable('systemd-backlight',
# 'src/backlight/backlight.c',
@@ -1743,7 +1743,7 @@ endif
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# if conf.get('ENABLE_RFKILL', false)
# executable('systemd-rfkill',
# 'src/rfkill/rfkill.c',
@@ -1753,7 +1753,7 @@ endif
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# executable('systemd-system-update-generator',
# 'src/system-update-generator/system-update-generator.c',
# include_directories : includes,
@@ -1761,7 +1761,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : systemgeneratordir)
-#
+#
# if conf.get('HAVE_LIBCRYPTSETUP', false)
# executable('systemd-cryptsetup',
# 'src/cryptsetup/cryptsetup.c',
@@ -1771,7 +1771,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# executable('systemd-cryptsetup-generator',
# 'src/cryptsetup/cryptsetup-generator.c',
# include_directories : includes,
@@ -1780,7 +1780,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : systemgeneratordir)
-#
+#
# executable('systemd-veritysetup',
# 'src/veritysetup/veritysetup.c',
# include_directories : includes,
@@ -1789,7 +1789,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# executable('systemd-veritysetup-generator',
# 'src/veritysetup/veritysetup-generator.c',
# include_directories : includes,
@@ -1799,7 +1799,7 @@ endif
# install : true,
# install_dir : systemgeneratordir)
# endif
-#
+#
# if conf.get('HAVE_SYSV_COMPAT', false)
# executable('systemd-sysv-generator',
# 'src/sysv-generator/sysv-generator.c',
@@ -1808,7 +1808,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : systemgeneratordir)
-#
+#
# executable('systemd-rc-local-generator',
# 'src/rc-local-generator/rc-local-generator.c',
# include_directories : includes,
@@ -1817,7 +1817,7 @@ endif
# install : true,
# install_dir : systemgeneratordir)
# endif
-#
+#
# if conf.get('ENABLE_HOSTNAMED', false)
# executable('systemd-hostnamed',
# 'src/hostname/hostnamed.c',
@@ -1826,7 +1826,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('hostnamectl',
# 'src/hostname/hostnamectl.c',
# include_directories : includes,
@@ -1835,7 +1835,7 @@ endif
# install : true)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_LOCALED', false)
# if conf.get('HAVE_XKBCOMMON', false)
# # logind will load libxkbcommon.so dynamically on its own
@@ -1843,7 +1843,7 @@ endif
# else
# deps = []
# endif
-#
+#
# executable('systemd-localed',
# systemd_localed_sources,
# include_directories : includes,
@@ -1852,7 +1852,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('localectl',
# localectl_sources,
# include_directories : includes,
@@ -1861,7 +1861,7 @@ endif
# install : true)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_TIMEDATED', false)
# executable('systemd-timedated',
# 'src/timedate/timedated.c',
@@ -1870,7 +1870,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('timedatectl',
# 'src/timedate/timedatectl.c',
# include_directories : includes,
@@ -1879,7 +1879,7 @@ endif
# install : true)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_TIMESYNCD', false)
# executable('systemd-timesyncd',
# systemd_timesyncd_sources,
@@ -1891,7 +1891,7 @@ endif
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# if conf.get('ENABLE_MACHINED', false)
# executable('systemd-machined',
# systemd_machined_sources,
@@ -1901,7 +1901,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('machinectl',
# 'src/machine/machinectl.c',
# include_directories : includes,
@@ -1914,7 +1914,7 @@ endif
# install_dir : rootbindir)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_IMPORTD', false)
# executable('systemd-importd',
# systemd_importd_sources,
@@ -1924,7 +1924,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# systemd_pull = executable('systemd-pull',
# systemd_pull_sources,
# include_directories : includes,
@@ -1937,7 +1937,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# systemd_import = executable('systemd-import',
# systemd_import_sources,
# include_directories : includes,
@@ -1949,7 +1949,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# systemd_export = executable('systemd-export',
# systemd_export_sources,
# include_directories : includes,
@@ -1963,7 +1963,7 @@ endif
# install_dir : rootlibexecdir)
# public_programs += [systemd_pull, systemd_import, systemd_export]
# endif
-#
+#
# if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_LIBCURL', false)
# exe = executable('systemd-journal-upload',
# systemd_journal_upload_sources,
@@ -1979,7 +1979,7 @@ endif
# install_dir : rootlibexecdir)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_REMOTE', false) and conf.get('HAVE_MICROHTTPD', false)
# s_j_remote = executable('systemd-journal-remote',
# systemd_journal_remote_sources,
@@ -1993,7 +1993,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# s_j_gatewayd = executable('systemd-journal-gatewayd',
# systemd_journal_gatewayd_sources,
# include_directories : includes,
@@ -2008,7 +2008,7 @@ endif
# install_dir : rootlibexecdir)
# public_programs += [s_j_remote, s_j_gatewayd]
# endif
-#
+#
# if conf.get('ENABLE_COREDUMP', false)
# executable('systemd-coredump',
# systemd_coredump_sources,
@@ -2022,7 +2022,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('coredumpctl',
# coredumpctl_sources,
# include_directories : includes,
@@ -2034,7 +2034,7 @@ endif
# install : true)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_BINFMT', false)
# exe = executable('systemd-binfmt',
# 'src/binfmt/binfmt.c',
@@ -2044,13 +2044,13 @@ endif
# install : true,
# install_dir : rootlibexecdir)
# public_programs += [exe]
-#
+#
# meson.add_install_script('sh', '-c',
# mkdir_p.format(binfmtdir))
# meson.add_install_script('sh', '-c',
# mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
# endif
-#
+#
# if conf.get('ENABLE_VCONSOLE', false)
# executable('systemd-vconsole-setup',
# 'src/vconsole/vconsole-setup.c',
@@ -2060,7 +2060,7 @@ endif
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# if conf.get('ENABLE_RANDOMSEED', false)
# executable('systemd-random-seed',
# 'src/random-seed/random-seed.c',
@@ -2070,7 +2070,7 @@ endif
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# if conf.get('ENABLE_FIRSTBOOT', false)
# executable('systemd-firstboot',
# 'src/firstboot/firstboot.c',
@@ -2081,7 +2081,7 @@ endif
# install : true,
# install_dir : rootbindir)
# endif
-#
+#
# executable('systemd-remount-fs',
# 'src/remount-fs/remount-fs.c',
# 'src/core/mount-setup.c',
@@ -2091,7 +2091,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# executable('systemd-machine-id-setup',
# 'src/machine-id-setup/machine-id-setup-main.c',
# 'src/core/machine-id-setup.c',
@@ -2101,7 +2101,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootbindir)
-#
+#
# executable('systemd-fsck',
# 'src/fsck/fsck.c',
# include_directories : includes,
@@ -2109,7 +2109,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# executable('systemd-sleep',
# 'src/sleep/sleep.c',
# include_directories : includes,
@@ -2117,7 +2117,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('systemd-sysctl',
# 'src/sysctl/sysctl.c',
# include_directories : includes,
@@ -2126,7 +2126,7 @@ endif
# install : true,
# install_dir : rootlibexecdir)
# public_programs += [exe]
-#
+#
# executable('systemd-ac-power',
# 'src/ac-power/ac-power.c',
# include_directories : includes,
@@ -2134,7 +2134,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('systemd-detect-virt',
# 'src/detect-virt/detect-virt.c',
# include_directories : includes,
@@ -2142,7 +2142,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-delta',
# 'src/delta/delta.c',
# include_directories : includes,
@@ -2150,7 +2150,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-escape',
# 'src/escape/escape.c',
# include_directories : includes,
@@ -2159,7 +2159,7 @@ endif
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-notify',
# 'src/notify/notify.c',
# include_directories : includes,
@@ -2168,7 +2168,7 @@ endif
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# executable('systemd-volatile-root',
# 'src/volatile-root/volatile-root.c',
# include_directories : includes,
@@ -2176,7 +2176,7 @@ endif
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# executable('systemd-cgroups-agent',
# 'src/cgroups-agent/cgroups-agent.c',
# include_directories : includes,
@@ -2202,7 +2202,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-ask-password',
# 'src/ask-password/ask-password.c',
# include_directories : includes,
@@ -2211,7 +2211,7 @@ executable('elogind-cgroups-agent',
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# executable('systemd-reply-password',
# 'src/reply-password/reply-password.c',
# include_directories : includes,
@@ -2219,7 +2219,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('systemd-tty-ask-password-agent',
# 'src/tty-ask-password-agent/tty-ask-password-agent.c',
# include_directories : includes,
@@ -2228,7 +2228,7 @@ executable('elogind-cgroups-agent',
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-cgls',
# 'src/cgls/cgls.c',
# include_directories : includes,
@@ -2236,7 +2236,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-cgtop',
# 'src/cgtop/cgtop.c',
# include_directories : includes,
@@ -2244,7 +2244,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# executable('systemd-initctl',
# 'src/initctl/initctl.c',
# include_directories : includes,
@@ -2252,7 +2252,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# exe = executable('systemd-mount',
# 'src/mount/mount-tool.c',
# include_directories : includes,
@@ -2260,10 +2260,10 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# meson.add_install_script(meson_make_symlink,
# 'systemd-mount', join_paths(bindir, 'systemd-umount'))
-#
+#
# exe = executable('systemd-run',
# 'src/run/run.c',
# include_directories : includes,
@@ -2271,7 +2271,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-stdio-bridge',
# 'src/stdio-bridge/stdio-bridge.c',
# include_directories : includes,
@@ -2279,7 +2279,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# exe = executable('busctl',
# 'src/busctl/busctl.c',
# 'src/busctl/busctl-introspect.c',
@@ -2289,7 +2289,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# if conf.get('ENABLE_SYSUSERS', false)
# exe = executable('systemd-sysusers',
# 'src/sysusers/sysusers.c',
@@ -2300,7 +2300,7 @@ executable('elogind-cgroups-agent',
# install_dir : rootbindir)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_TMPFILES', false)
# exe = executable('systemd-tmpfiles',
# 'src/tmpfiles/tmpfiles.c',
@@ -2312,7 +2312,7 @@ executable('elogind-cgroups-agent',
# install_dir : rootbindir)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_HWDB', false)
# exe = executable('systemd-hwdb',
# 'src/hwdb/hwdb.c',
@@ -2324,7 +2324,7 @@ executable('elogind-cgroups-agent',
# install_dir : rootbindir)
# public_programs += [exe]
# endif
-#
+#
# if conf.get('ENABLE_QUOTACHECK', false)
# executable('systemd-quotacheck',
# 'src/quotacheck/quotacheck.c',
@@ -2334,7 +2334,7 @@ executable('elogind-cgroups-agent',
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# exe = executable('systemd-socket-proxyd',
# 'src/socket-proxy/socket-proxyd.c',
# include_directories : includes,
@@ -2344,7 +2344,7 @@ executable('elogind-cgroups-agent',
# install : true,
# install_dir : rootlibexecdir)
# public_programs += [exe]
-#
+#
# exe = executable('systemd-udevd',
# systemd_udevd_sources,
# include_directories : includes,
@@ -2361,7 +2361,7 @@ executable('elogind-cgroups-agent',
# install : true,
# install_dir : rootlibexecdir)
# public_programs += [exe]
-#
+#
# exe = executable('udevadm',
# udevadm_sources,
# include_directories : includes,
@@ -2377,7 +2377,7 @@ executable('elogind-cgroups-agent',
# install : true,
# install_dir : rootbindir)
# public_programs += [exe]
-#
+#
# executable('systemd-shutdown',
# systemd_shutdown_sources,
# include_directories : includes,
@@ -2385,7 +2385,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# executable('systemd-update-done',
# 'src/update-done/update-done.c',
# include_directories : includes,
@@ -2393,7 +2393,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# executable('systemd-update-utmp',
# 'src/update-utmp/update-utmp.c',
# include_directories : includes,
@@ -2402,7 +2402,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# if conf.get('HAVE_KMOD', false)
# executable('systemd-modules-load',
# 'src/modules-load/modules-load.c',
@@ -2412,13 +2412,13 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# meson.add_install_script('sh', '-c',
# mkdir_p.format(modulesloaddir))
# meson.add_install_script('sh', '-c',
# mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
# endif
-#
+#
# exe = executable('systemd-nspawn',
# systemd_nspawn_sources,
# 'src/core/mount-setup.c', # FIXME: use a variable?
@@ -2434,7 +2434,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true)
# public_programs += [exe]
-#
+#
# if conf.get('ENABLE_NETWORKD', false)
# executable('systemd-networkd',
# systemd_networkd_sources,
@@ -2447,7 +2447,7 @@ executable('elogind-cgroups-agent',
# install_rpath : rootlibexecdir,
# install : true,
# install_dir : rootlibexecdir)
-#
+#
# executable('systemd-networkd-wait-online',
# systemd_networkd_wait_online_sources,
# include_directories : includes,
@@ -2457,7 +2457,7 @@ executable('elogind-cgroups-agent',
# install : true,
# install_dir : rootlibexecdir)
# endif
-#
+#
# exe = executable('networkctl',
# networkctl_sources,
# include_directories : includes,
@@ -2523,7 +2523,7 @@ endforeach
# install_dir : testsdir)
# test('test-libsystemd-sym',
# test_libsystemd_sym)
-#
+#
# test_libudev_sym = executable(
# 'test-libudev-sym',
# test_libudev_sym_c,
@@ -2553,7 +2553,7 @@ make_man_index_py = find_program('tools/make-man-index.py')
xml_helper_py = find_program('tools/xml_helper.py')
#if 0 /// UNNEEDED by elogind
# hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
-#
+#
# subdir('units')
# subdir('sysctl.d')
# subdir('sysusers.d')
@@ -2711,7 +2711,7 @@ status = [
# status += [
# 'default DNS servers: @0@'.format(alt_dns_servers),
# 'default NTP servers: @0@'.format(alt_ntp_servers)]
-#
+#
# alt_time_epoch = run_command('date', '-Is', '-u', '-d',
# '@@0@'.format(time_epoch)).stdout().strip()
# status += [
@@ -2727,7 +2727,7 @@ status = [
# if conf.get('ENABLE_EFI', false)
# status += [
# 'efi arch: @0@'.format(efi_arch)]
-#
+#
# if have_gnu_efi
# status += [
# 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME),
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 5999af3ce..6b3816437 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1004,7 +1004,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi
int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
_cleanup_fclose_ FILE *f = NULL;
char line[LINE_MAX];
- const char *fs, *controller_str;
+ const char *fs, *controller_str = NULL;
size_t cs = 0;
int unified;
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 4c6ab1137..2fa377414 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -57,13 +57,11 @@ typedef enum CGroupMask {
_CGROUP_MASK_ALL = CGROUP_CONTROLLER_TO_MASK(_CGROUP_CONTROLLER_MAX) - 1
} CGroupMask;
-#if 0 /// UNNEEDED by elogind
/* Special values for all weight knobs on unified hierarchy */
#define CGROUP_WEIGHT_INVALID ((uint64_t) -1)
#define CGROUP_WEIGHT_MIN UINT64_C(1)
#define CGROUP_WEIGHT_MAX UINT64_C(10000)
#define CGROUP_WEIGHT_DEFAULT UINT64_C(100)
-#endif // 0
#define CGROUP_LIMIT_MIN UINT64_C(0)
#define CGROUP_LIMIT_MAX ((uint64_t) -1)
@@ -90,6 +88,7 @@ extern const uint64_t cgroup_io_limit_defaults[_CGROUP_IO_LIMIT_TYPE_MAX];
const char* cgroup_io_limit_type_to_string(CGroupIOLimitType t) _const_;
CGroupIOLimitType cgroup_io_limit_type_from_string(const char *s) _pure_;
+#endif // 0
/* Special values for the cpu.shares attribute */
#define CGROUP_CPU_SHARES_INVALID ((uint64_t) -1)
@@ -97,11 +96,13 @@ CGroupIOLimitType cgroup_io_limit_type_from_string(const char *s) _pure_;
#define CGROUP_CPU_SHARES_MAX UINT64_C(262144)
#define CGROUP_CPU_SHARES_DEFAULT UINT64_C(1024)
+#if 0 /// UNNEEDED by elogind
static inline bool CGROUP_CPU_SHARES_IS_OK(uint64_t x) {
return
x == CGROUP_CPU_SHARES_INVALID ||
(x >= CGROUP_CPU_SHARES_MIN && x <= CGROUP_CPU_SHARES_MAX);
}
+#endif // 0
/* Special values for the blkio.weight attribute */
#define CGROUP_BLKIO_WEIGHT_INVALID ((uint64_t) -1)
@@ -109,6 +110,7 @@ static inline bool CGROUP_CPU_SHARES_IS_OK(uint64_t x) {
#define CGROUP_BLKIO_WEIGHT_MAX UINT64_C(1000)
#define CGROUP_BLKIO_WEIGHT_DEFAULT UINT64_C(500)
+#if 0 /// UNNEEDED by elogind
static inline bool CGROUP_BLKIO_WEIGHT_IS_OK(uint64_t x) {
return
x == CGROUP_BLKIO_WEIGHT_INVALID ||
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 95459819a..7edc31d0a 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -40,6 +40,7 @@
#include "missing.h"
#include "parse-util.h"
#include "path-util.h"
+#include "process-util.h"
#include "random-util.h"
#include "stdio-util.h"
#include "string-util.h"
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index f7e9f329d..cf5c80eca 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -37,6 +37,7 @@
#include "mkdir.h"
#include "parse-util.h"
#include "path-util.h"
+#include "process-util.h"
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c
index db3167665..766770389 100644
--- a/src/basic/hexdecoct.c
+++ b/src/basic/hexdecoct.c
@@ -25,6 +25,7 @@
#include "alloc-util.h"
#include "hexdecoct.h"
#include "macro.h"
+#include "string-util.h"
#include "util.h"
char octchar(int x) {
diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h
index beadf369a..664724c00 100644
--- a/src/basic/missing_syscall.h
+++ b/src/basic/missing_syscall.h
@@ -188,7 +188,6 @@ static inline int setns(int fd, int nstype) {
/* ======================================================================= */
-#if 0 /// UNNEEDED by elogind
static inline pid_t raw_getpid(void) {
#if defined(__alpha__)
return (pid_t) syscall(__NR_getxpid);
@@ -196,7 +195,6 @@ static inline pid_t raw_getpid(void) {
return (pid_t) syscall(__NR_getpid);
#endif
}
-#endif // 0
/* ======================================================================= */
diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index aee878e88..b38363076 100644
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -707,6 +707,7 @@ int umount_verbose(const char *what) {
return log_error_errno(errno, "Failed to unmount %s: %m", what);
return 0;
}
+#endif // 0
const char *mount_propagation_flags_to_string(unsigned long flags) {
@@ -739,4 +740,3 @@ int mount_propagation_flags_from_string(const char *name, unsigned long *ret) {
return -EINVAL;
return 0;
}
-#endif // 0
diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index 56a1f8487..5ce7c9747 100644
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -67,7 +67,7 @@ int mount_verbose(
unsigned long flags,
const char *options);
int umount_verbose(const char *where);
+#endif // 0
const char *mount_propagation_flags_to_string(unsigned long flags);
int mount_propagation_flags_from_string(const char *name, unsigned long *ret);
-#endif // 0
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index f808ecb72..c61c9e637 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -28,6 +28,7 @@
//#include "extract-word.h"
#include "macro.h"
#include "parse-util.h"
+#include "process-util.h"
#include "string-util.h"
/// Additional includes needed by elogind
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 4993de886..3f9b1a256 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -958,6 +958,7 @@ int ioprio_parse_priority(const char *s, int *ret) {
*ret = i;
return 0;
}
+#endif // 0
/* The cached PID, possible values:
*
@@ -1021,6 +1022,7 @@ pid_t getpid_cached(void) {
}
}
+#if 0 /// UNNEEDED by elogind
static const char *const ioprio_class_table[] = {
[IOPRIO_CLASS_NONE] = "none",
[IOPRIO_CLASS_RT] = "realtime",
diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index fec60c4af..a7bdbffa9 100644
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -137,11 +137,13 @@ static inline bool ioprio_class_is_valid(int i) {
static inline bool ioprio_priority_is_valid(int i) {
return i >= 0 && i < IOPRIO_BE_NR;
}
+#endif // 0
static inline bool pid_is_valid(pid_t p) {
return p > 0;
}
+#if 0 /// UNNEEDED by elogind
int ioprio_parse_priority(const char *s, int *ret);
#endif // 0
diff --git a/src/libelogind/meson.build b/src/libelogind/meson.build
index 5d012ea6e..098a8a34b 100644
--- a/src/libelogind/meson.build
+++ b/src/libelogind/meson.build
@@ -131,8 +131,12 @@ libelogind_internal = static_library(
install : false,
include_directories : includes,
link_with : libbasic,
- dependencies : [threads,
- librt])
+#if 0 /// elogind does not need librt
+# dependencies : [threads,
+# librt])
+#else
+ dependencies : [threads])
+#endif // 0
libelogind_sym = 'src/libelogind/libelogind.sym'
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index f8228a7e3..3f2d1b0bc 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -49,6 +49,7 @@
#include "macro.h"
#include "missing.h"
#include "parse-util.h"
+#include "process-util.h"
#include "string-util.h"
#include "strv.h"
#include "util.h"
diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index 85459e166..06d3c64ff 100644
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -38,6 +38,7 @@
#include "fs-util.h"
#include "parse-util.h"
#include "path-util.h"
+#include "process-util.h"
#include "socket-util.h"
#include "strv.h"
#include "util.h"
diff --git a/src/libelogind/sd-event/test-event.c b/src/libelogind/sd-event/test-event.c
index 1a581ae23..656f08d56 100644
--- a/src/libelogind/sd-event/test-event.c
+++ b/src/libelogind/sd-event/test-event.c
@@ -24,6 +24,7 @@
#include "fd-util.h"
#include "log.h"
#include "macro.h"
+#include "process-util.h"
#include "signal-util.h"
#include "util.h"
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 6a59f8b47..9880f8ffa 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -33,6 +33,7 @@
#include "bus-error.h"
#include "bus-util.h"
#include "escape.h"
+#include "extract-word.h"
#include "fd-util.h"
#include "fileio.h"
#include "format-util.h"
@@ -41,6 +42,7 @@
#include "mkdir.h"
#include "parse-util.h"
#include "path-util.h"
+#include "process-util.h"
#include "string-table.h"
#include "terminal-util.h"
#include "user-util.h"
diff --git a/src/login/meson.build b/src/login/meson.build
index 3a496a6e5..9d6e7260c 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -69,7 +69,13 @@ liblogind_core = static_library(
'logind-core',
liblogind_core_sources,
include_directories : includes,
- dependencies : [libacl])
+#if 0 /// elogind needs audit support for utmp inclusion
+# dependencies : [libacl])
+#else
+ dependencies : [libacl,
+ libaudit])
+#endif // 0
+
loginctl_sources = files('''
loginctl.c
@@ -91,15 +97,15 @@ loginctl_sources += files('''
# configuration : substs)
# install_data(logind_conf,
# install_dir : pkgsysconfdir)
-#
+#
# pam_systemd_sym = 'src/login/pam_systemd.sym'
# pam_systemd_c = files('pam_systemd.c')
-#
+#
# install_data('org.freedesktop.login1.conf',
# install_dir : dbuspolicydir)
# install_data('org.freedesktop.login1.service',
# install_dir : dbussystemservicedir)
-#
+#
# custom_target(
# 'org.freedesktop.login1.policy',
# input : 'org.freedesktop.login1.policy.in',
@@ -107,11 +113,11 @@ loginctl_sources += files('''
# command : intltool_command,
# install : install_polkit,
# install_dir : polkitpolicydir)
-#
+#
# install_data('70-power-switch.rules',
# '70-uaccess.rules',
# install_dir : udevrulesdir)
-#
+#
# foreach file : ['71-seat.rules',
# '73-seat-late.rules']
# gen = configure_file(
@@ -121,7 +127,7 @@ loginctl_sources += files('''
# install_data(gen,
# install_dir : udevrulesdir)
# endforeach
-#
+#
# custom_target(
# 'systemd-user',
# input : 'systemd-user.m4',
diff --git a/src/login/pam_elogind.c b/src/login/pam_elogind.c
index 32a968bb6..3af3487f5 100644
--- a/src/login/pam_elogind.c
+++ b/src/login/pam_elogind.c
@@ -41,6 +41,7 @@
#include "login-util.h"
#include "macro.h"
#include "parse-util.h"
+#include "process-util.h"
#include "socket-util.h"
#include "strv.h"
#include "terminal-util.h"
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 7505d3963..a35b7e5f6 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -173,7 +173,7 @@ libshared = shared_library(
libshared_name,
shared_sources,
basic_sources,
-#if 0 /// "Slightly" different in elogind
+#if 0 /// UNNEEDED by elogind
# journal_internal_sources,
# libsystemd_internal_sources,
# libudev_sources,
@@ -184,8 +184,12 @@ libshared = shared_library(
link_args : ['-shared'],
c_args : ['-fvisibility=default'],
dependencies : libshared_deps,
- install : true,
- install_dir : rootlibexecdir)
+#if 0 /// UNNEEDED by elogind
+# install : true,
+# install_dir : rootlibexecdir)
+#else
+ install : false)
+#endif // 0
libshared_static = static_library(
libshared_name,
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index f708dcfa1..ed32f0305 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include "alloc-util.h"
#include "fileio.h"
#include "log.h"
#include "string-util.h"
diff --git a/src/test/meson.build b/src/test/meson.build
index ccf0f7077..090d0787d 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -35,7 +35,7 @@ test_libelogind_sym_c = custom_target(
# output : 'test-libudev-sym.c',
# command : [generate_sym_test_py, '@INPUT0@', '@INPUT1@'],
# capture : true)
-#
+#
# test_dlopen_c = files('test-dlopen.c')
#endif // 0
@@ -46,7 +46,7 @@ tests += [
# [['src/test/test-device-nodes.c'],
# [],
# []],
-#
+#
# [['src/test/test-engine.c',
# 'src/test/test-helper.c'],
# [libcore,
@@ -58,7 +58,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
-#
+#
# [['src/test/test-job-type.c'],
# [libcore,
# libshared],
@@ -68,7 +68,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
-#
+#
# [['src/test/test-ns.c'],
# [libcore,
# libshared],
@@ -79,7 +79,7 @@ tests += [
# libmount,
# libblkid],
# '', 'manual'],
-#
+#
# [['src/test/test-loopback.c'],
# [libcore,
# libshared],
@@ -89,7 +89,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
-#
+#
# [['src/test/test-hostname.c'],
# [libcore,
# libshared],
@@ -100,17 +100,17 @@ tests += [
# libmount,
# libblkid],
# '', 'unsafe'],
-#
+#
# [['src/test/test-dns-domain.c'],
# [libcore,
# libelogind_network],
# []],
-#
+#
# [['src/test/test-boot-timestamps.c'],
# [],
# [],
# 'ENABLE_EFI'],
-#
+#
# [['src/test/test-unit-name.c',
# 'src/test/test-helper.c'],
# [libcore,
@@ -121,7 +121,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
-#
+#
# [['src/test/test-unit-file.c',
# 'src/test/test-helper.c'],
# [libcore,
@@ -282,32 +282,32 @@ tests += [
# [['src/test/test-terminal-util.c'],
# [],
# []],
-#
+#
# [['src/test/test-path-lookup.c'],
# [],
# []],
-#
+#
# [['src/test/test-uid-range.c'],
# [],
# []],
-#
+#
# [['src/test/test-cap-list.c',
# generated_gperf_headers],
# [],
# [libcap]],
-#
+#
# [['src/test/test-socket-util.c'],
# [],
# []],
-#
+#
# [['src/test/test-barrier.c'],
# [],
# []],
-#
+#
# [['src/test/test-tmpfiles.c'],
# [],
# []],
-#
+#
# [['src/test/test-namespace.c'],
# [libcore,
# libshared],
@@ -323,26 +323,26 @@ tests += [
# [['src/test/test-install-root.c'],
# [],
# []],
-#
+#
# [['src/test/test-acl-util.c'],
# [],
# [],
# 'HAVE_ACL'],
-#
+#
# [['src/test/test-seccomp.c'],
# [],
# [libseccomp],
# 'HAVE_SECCOMP'],
-#
+#
# [['src/test/test-rlimit-util.c'],
# [],
# []],
-#
+#
# [['src/test/test-ask-password-api.c'],
# [],
# [],
# '', 'manual'],
-#
+#
# [['src/test/test-dissect-image.c'],
# [],
# [libblkid],
@@ -376,7 +376,7 @@ tests += [
# [['src/test/test-bitmap.c'],
# [],
# []],
-#
+#
# [['src/test/test-xml.c'],
# [],
# []],
@@ -418,15 +418,15 @@ tests += [
# [['src/test/test-fileio.c'],
# [],
# []],
-#
+#
# [['src/test/test-time.c'],
# [],
# []],
-#
+#
# [['src/test/test-clock.c'],
# [],
# []],
-#
+#
# [['src/test/test-architecture.c'],
# [],
# []],
@@ -446,13 +446,13 @@ tests += [
# [],
# [],
# '', 'manual'],
-#
-#
+#
+#
# [['src/test/test-firewall-util.c'],
# [libshared],
# [],
# 'HAVE_LIBIPTC'],
-#
+#
# [['src/test/test-netlink-manual.c'],
# [],
# [libkmod],
@@ -467,15 +467,15 @@ tests += [
# [['src/test/test-date.c'],
# [],
# []],
-#
+#
# [['src/test/test-sleep.c'],
# [],
# []],
-#
+#
# [['src/test/test-replace-var.c'],
# [],
# []],
-#
+#
# [['src/test/test-calendarspec.c'],
# [],
# []],
@@ -508,19 +508,19 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
-#
+#
# [['src/test/test-cgroup-util.c'],
# [],
# []],
-#
+#
# [['src/test/test-env-util.c'],
# [],
# []],
-#
+#
# [['src/test/test-strbuf.c'],
# [],
# []],
-#
+#
# [['src/test/test-strv.c'],
# [],
# []],
@@ -541,7 +541,7 @@ tests += [
# libselinux,
# libmount,
# libblkid]],
-#
+#
# [['src/test/test-execute.c',
# 'src/test/test-helper.c'],
# [libcore,
@@ -562,17 +562,17 @@ tests += [
# [['src/test/test-strxcpyx.c'],
# [],
# []],
-#
+#
# [['src/test/test-install.c'],
# [libcore,
# libshared],
# [],
# '', 'manual'],
-#
+#
# [['src/test/test-watchdog.c'],
# [],
# []],
-#
+#
# [['src/test/test-sched-prio.c',
# 'src/test/test-helper.c'],
# [libcore,
@@ -598,20 +598,20 @@ tests += [
# generated_gperf_headers],
# [],
# []],
-#
+#
# [['src/test/test-arphrd-list.c',
# generated_gperf_headers],
# [],
# []],
-#
+#
# [['src/test/test-journal-importer.c'],
# [],
# []],
-#
+#
# [['src/test/test-libudev.c'],
# [libshared],
# []],
-#
+#
# [['src/test/test-udev.c'],
# [libudev_core,
# libudev_internal,
@@ -653,14 +653,14 @@ tests += [
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-journal-send.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-journal-syslog.c'],
# [libjournal_core,
# libshared],
@@ -668,63 +668,63 @@ tests += [
# libxz,
# liblz4,
# libselinux]],
-#
+#
# [['src/journal/test-journal-match.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-journal-enum.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-journal-stream.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-journal-flush.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-journal-init.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-journal-verify.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-journal-interleaving.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-mmap-cache.c'],
# [libjournal_core,
# libshared],
# [threads,
# libxz,
# liblz4]],
-#
+#
# [['src/journal/test-catalog.c'],
# [libjournal_core,
# libshared],
@@ -732,20 +732,20 @@ tests += [
# libxz,
# liblz4],
# '', '', '-DCATALOG_DIR="@0@"'.format(build_catalog_dir)],
-#
+#
# [['src/journal/test-compress.c'],
# [libjournal_core,
# libshared],
# [liblz4,
# libxz]],
-#
+#
# [['src/journal/test-compress-benchmark.c'],
# [libjournal_core,
# libshared],
# [liblz4,
# libxz],
# '', 'timeout=90'],
-#
+#
# [['src/journal/test-audit-type.c'],
# [libjournal_core,
# libshared],
@@ -775,7 +775,7 @@ tests += [
# [['src/libelogind/sd-bus/test-bus-chat.c'],
# [],
# [threads]],
-#
+#
# [['src/libelogind/sd-bus/test-bus-cleanup.c'],
# [],
# [threads,
@@ -813,7 +813,7 @@ tests += [
# [libglib,
# libgobject,
# libgio]],
-#
+#
# [['src/libelogind/sd-bus/test-bus-creds.c'],
# [],
# []],
@@ -827,15 +827,15 @@ tests += [
# [['src/libelogind/sd-bus/test-bus-kernel.c'],
# [],
# []],
-#
+#
# [['src/libelogind/sd-bus/test-bus-kernel-bloom.c'],
# [],
# []],
-#
+#
# [['src/libelogind/sd-bus/test-bus-benchmark.c'],
# [],
# [threads]],
-#
+#
# [['src/libelogind/sd-bus/test-bus-zero-copy.c'],
# [],
# []],
@@ -853,11 +853,11 @@ tests += [
# [['src/libelogind/sd-netlink/test-netlink.c'],
# [],
# []],
-#
+#
# [['src/libelogind/sd-netlink/test-local-addresses.c'],
# [],
# []],
-#
+#
# [['src/libelogind/sd-resolve/test-resolve.c'],
# [],
# [threads]],
@@ -888,13 +888,13 @@ tests += [
# [libshared,
# libelogind_network],
# []],
-#
+#
# [['src/libelogind-network/test-sd-dhcp-lease.c',
# 'src/libelogind-network/dhcp-lease-internal.h'],
# [libshared,
# libelogind_network],
# []],
-#
+#
# [['src/libelogind-network/test-dhcp-client.c',
# 'src/libelogind-network/dhcp-protocol.h',
# 'src/libelogind-network/dhcp-internal.h',
@@ -902,33 +902,33 @@ tests += [
# [libshared,
# libelogind_network],
# []],
-#
+#
# [['src/libelogind-network/test-dhcp-server.c'],
# [libshared,
# libelogind_network],
# []],
-#
+#
# [['src/libelogind-network/test-ipv4ll.c',
# 'src/libelogind-network/arp-util.h',
# 'src/systemd/sd-ipv4ll.h'],
# [libshared,
# libelogind_network],
# []],
-#
+#
# [['src/libelogind-network/test-ipv4ll-manual.c',
# 'src/systemd/sd-ipv4ll.h'],
# [libshared,
# libelogind_network],
# [],
# '', 'manual'],
-#
+#
# [['src/libelogind-network/test-acd.c',
# 'src/systemd/sd-ipv4acd.h'],
# [libshared,
# libelogind_network],
# [],
# '', 'manual'],
-#
+#
# [['src/libelogind-network/test-ndisc-rs.c',
# 'src/libelogind-network/dhcp-identifier.h',
# 'src/libelogind-network/dhcp-identifier.c',
@@ -938,14 +938,14 @@ tests += [
# [libshared,
# libelogind_network],
# []],
-#
+#
# [['src/libelogind-network/test-ndisc-ra.c',
# 'src/libelogind-network/icmp6-util.h',
# 'src/systemd/sd-ndisc.h'],
# [libshared,
# libelogind_network],
# []],
-#
+#
# [['src/libelogind-network/test-dhcp6-client.c',
# 'src/libelogind-network/dhcp-identifier.h',
# 'src/libelogind-network/dhcp-identifier.c',
@@ -954,7 +954,7 @@ tests += [
# [libshared,
# libelogind_network],
# []],
-#
+#
# [['src/libelogind-network/test-lldp.c'],
# [libshared,
# libelogind_network],
@@ -977,5 +977,9 @@ tests += [
[['src/login/test-login-tables.c'],
[liblogind_core,
libshared],
- [threads]],
+#if 0 /// elogind does not include udev implicitly
+# [threads]],
+#else
+ [threads,libudev]],
+#endif // 0
]
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 71e318a15..2ed91c780 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -22,6 +22,7 @@
#include "cgroup-util.h"
#include "path-util.h"
+#include "process-util.h"
#include "string-util.h"
#include "util.h"
diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c
index 0471cd2f2..7c28e84e9 100644
--- a/src/test/test-hashmap-plain.c
+++ b/src/test/test-hashmap-plain.c
@@ -903,13 +903,17 @@ static void test_hashmap_reserve(void) {
}
void test_hashmap_funcs(void) {
+#if 0 /// UNNEEDED by elogind
int r;
+#endif // 0
log_parse_environment();
log_open();
+#if 0 /// UNNEEDED by elogind
r = getenv_bool("SYSTEMD_SLOW_TESTS");
arg_slow = r >= 0 ? r : SYSTEMD_SLOW_TESTS_DEFAULT;
+#endif // 0
test_hashmap_copy();
test_hashmap_get_strv();
diff --git a/src/test/test-log.c b/src/test/test-log.c
index 8ab569f47..ec1bc2a63 100644
--- a/src/test/test-log.c
+++ b/src/test/test-log.c
@@ -22,6 +22,7 @@
#include "format-util.h"
#include "log.h"
+#include "process-util.h"
#include "util.h"
assert_cc(LOG_REALM_REMOVE_LEVEL(LOG_REALM_PLUS_LEVEL(LOG_REALM_SYSTEMD, LOG_FTP | LOG_DEBUG))
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index c9050f0d6..19ffe01d7 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -449,6 +449,7 @@ static void test_rename_process(void) {
test_rename_process_one("1234567", 1); /* should always fit */
test_rename_process_multi(); /* multiple invocations and dropped privileges */
}
+#endif // 0
static void test_getpid_cached(void) {
siginfo_t si;
@@ -504,7 +505,6 @@ static void test_getpid_measure(void) {
log_info("getpid_cached(): %llu/s\n", (unsigned long long) (MEASURE_ITERATIONS*USEC_PER_SEC/q));
}
-#endif // 0
int main(int argc, char *argv[]) {
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 92e392778..1830396ac 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -21,6 +21,7 @@
#include <unistd.h>
#include "macro.h"
+#include "process-util.h"
#include "signal-util.h"
static void test_block_signals(void) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 01:07:32 +0000