From: Zbigniew Jędrzejewski-Szmek Date: Fri, 9 Mar 2018 13:21:08 +0000 (+0100) Subject: meson: avoid warning about comparison of bool and string X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6341577dfd51022072eb1eb923e1ad732435afb3;p=elogind.git meson: avoid warning about comparison of bool and string meson.build:2907: WARNING: Trying to compare values of different types (bool, str) using ==. The result of this is undefined and will become a hard error in a future Meson release. (cherry picked from commit af4d7860c4e757f34a02ca73a0b14c73c18f8b30) --- diff --git a/meson.build b/meson.build index a9c3ac393..78d458560 100644 --- a/meson.build +++ b/meson.build @@ -54,7 +54,7 @@ m4_defines = [] ##################################################################### #if 0 /// elogind does not need this -# +# # # Try to install the git pre-commit hook # git_hook = run_command(join_paths(meson.source_root(), 'tools/add-git-hook.sh')) # if git_hook.returncode() == 0 @@ -181,7 +181,7 @@ modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d') # systemdstatedir = join_paths(localstatedir, 'lib/systemd') # catalogstatedir = join_paths(systemdstatedir, 'catalog') # randomseeddir = join_paths(localstatedir, 'lib/systemd') -# +# # docdir = get_option('docdir') # if docdir == '' # docdir = join_paths(datadir, 'doc/systemd') @@ -244,9 +244,9 @@ conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH', join_paths(pkgsysc # conf.set_quoted('SYSTEM_SYSVRCND_PATH', sysvrcnd_path) # conf.set_quoted('RC_LOCAL_SCRIPT_PATH_START', get_option('rc-local')) # conf.set_quoted('RC_LOCAL_SCRIPT_PATH_STOP', get_option('halt-local')) -# +# # conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper()) -# +# # conf.set_quoted('USER_CONFIG_UNIT_PATH', join_paths(pkgsysconfdir, 'user')) # conf.set_quoted('USER_DATA_UNIT_PATH', userunitdir) # conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root')) @@ -825,7 +825,7 @@ message('maximum system GID is @0@'.format(system_gid_max)) # conf.set('DYNAMIC_UID_MAX', dynamic_uid_max) # substs.set('dynamicuidmin', dynamic_uid_min) # substs.set('dynamicuidmax', dynamic_uid_max) -# +# # container_uid_base_min = get_option('container-uid-base-min').to_int() # container_uid_base_max = get_option('container-uid-base-max').to_int() # conf.set('CONTAINER_UID_BASE_MIN', container_uid_base_min) @@ -897,15 +897,15 @@ substs.set('TTY_GID', tty_gid) # users_gid = '-' # endif # substs.set('USERS_GID', users_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')) # substs.set('GROUP_RENDER_MODE', get_option('group-render-mode')) #endif // 0 @@ -918,7 +918,7 @@ substs.set('KILL_USER_PROCESSES', kill_user_processes ? 'yes' : 'no') # dns_servers = get_option('dns-servers') # conf.set_quoted('DNS_SERVERS', dns_servers) # substs.set('DNS_SERVERS', dns_servers) -# +# # ntp_servers = get_option('ntp-servers') # conf.set_quoted('NTP_SERVERS', ntp_servers) # substs.set('NTP_SERVERS', ntp_servers) @@ -976,7 +976,7 @@ endif # libmount = dependency('mount', # version : '>= 2.30', # required : not fuzzer_build) -# +# # want_seccomp = get_option('seccomp') # if want_seccomp != 'false' and not fuzzer_build # libseccomp = dependency('libseccomp', @@ -1074,7 +1074,7 @@ conf.set10('HAVE_AUDIT', have) # libblkid = [] # endif # conf.set10('HAVE_BLKID', have) -# +# # want_kmod = get_option('kmod') # if want_kmod != 'false' and not fuzzer_build # libkmod = dependency('libkmod', @@ -1117,7 +1117,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # endif # conf.set10('HAVE_MICROHTTPD', have) # m4_defines += have ? ['-DHAVE_MICROHTTPD'] : [] -# +# # want_libcryptsetup = get_option('libcryptsetup') # if want_libcryptsetup != 'false' and not fuzzer_build # libcryptsetup = dependency('libcryptsetup', @@ -1129,7 +1129,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libcryptsetup = [] # endif # conf.set10('HAVE_LIBCRYPTSETUP', have) -# +# # want_libcurl = get_option('libcurl') # if want_libcurl != 'false' and not fuzzer_build # libcurl = dependency('libcurl', @@ -1142,13 +1142,13 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # endif # conf.set10('HAVE_LIBCURL', have) # m4_defines += have ? ['-DHAVE_LIBCURL'] : [] -# +# # 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' and not fuzzer_build # libidn = dependency('libidn', # required : want_libidn == 'true') @@ -1169,7 +1169,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # endif # conf.set10('HAVE_LIBIDN2', have) # m4_defines += have ? ['-DHAVE_LIBIDN2'] : [] -# +# # want_libiptc = get_option('libiptc') # if want_libiptc != 'false' and not fuzzer_build # libiptc = dependency('libiptc', @@ -1181,7 +1181,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # endif # conf.set10('HAVE_LIBIPTC', have) # m4_defines += have ? ['-DHAVE_LIBIPTC'] : [] -# +# # want_qrencode = get_option('qrencode') # if want_qrencode != 'false' and not fuzzer_build # libqrencode = dependency('libqrencode', @@ -1192,7 +1192,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libqrencode = [] # endif # conf.set10('HAVE_QRENCODE', have) -# +# # want_gcrypt = get_option('gcrypt') # if want_gcrypt != 'false' and not fuzzer_build # libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true') @@ -1207,7 +1207,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libgpg_error = [] # endif # conf.set10('HAVE_GCRYPT', have) -# +# # want_gnutls = get_option('gnutls') # if want_gnutls != 'false' and not fuzzer_build # libgnutls = dependency('gnutls', @@ -1219,7 +1219,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libgnutls = [] # endif # conf.set10('HAVE_GNUTLS', have) -# +# # want_elfutils = get_option('elfutils') # if want_elfutils != 'false' and not fuzzer_build # libdw = dependency('libdw', @@ -1230,7 +1230,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libdw = [] # endif # conf.set10('HAVE_ELFUTILS', have) -# +# # want_zlib = get_option('zlib') # if want_zlib != 'false' and not fuzzer_build # libz = dependency('zlib', @@ -1241,7 +1241,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libz = [] # endif # conf.set10('HAVE_ZLIB', have) -# +# # want_bzip2 = get_option('bzip2') # if want_bzip2 != 'false' and not fuzzer_build # libbzip2 = cc.find_library('bz2', @@ -1252,7 +1252,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libbzip2 = [] # endif # conf.set10('HAVE_BZIP2', have) -# +# # want_xz = get_option('xz') # if want_xz != 'false' and not fuzzer_build # libxz = dependency('liblzma', @@ -1263,7 +1263,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # libxz = [] # endif # conf.set10('HAVE_XZ', have) -# +# # want_lz4 = get_option('lz4') # if want_lz4 != 'false' and not fuzzer_build # liblz4 = dependency('liblz4', @@ -1274,7 +1274,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : [] # liblz4 = [] # endif # conf.set10('HAVE_LZ4', have) -# +# # want_xkbcommon = get_option('xkbcommon') # if want_xkbcommon != 'false' and not fuzzer_build # libxkbcommon = dependency('xkbcommon', @@ -1358,7 +1358,7 @@ conf.set10('HAVE_DBUS', have) # 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 = (conf.get('HAVE_LIBCURL') == 1 and @@ -1373,7 +1373,7 @@ conf.set10('HAVE_DBUS', have) # have = false # endif # conf.set10('ENABLE_IMPORTD', have) -# +# # want_remote = get_option('remote') # if want_remote != 'false' # have_deps = [conf.get('HAVE_MICROHTTPD') == 1, @@ -1446,7 +1446,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', 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' @@ -1463,10 +1463,10 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests) # EFI_MACHINE_TYPE_NAME = '' # gnu_efi_arch = '' # endif -# +# # have = true # conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME) -# +# # conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int()) # else # have = false @@ -1583,7 +1583,7 @@ subdir('src/shared') # subdir('src/core') # subdir('src/udev') # subdir('src/network') -# +# # subdir('src/analyze') # subdir('src/journal-remote') # subdir('src/coredump') @@ -1623,14 +1623,14 @@ test_dlopen = executable( # ['systemd', 'ENABLE_NSS_SYSTEMD'], # ['mymachines', 'ENABLE_MACHINED'], # ['resolve', 'ENABLE_RESOLVE']] -# +# # condition = tuple[1] == '' or conf.get(tuple[1]) == 1 # 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), @@ -1648,13 +1648,13 @@ test_dlopen = executable( # 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 @@ -1679,11 +1679,11 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # meson.add_install_script(meson_make_symlink, # join_paths(rootlibexecdir, 'systemd'), # join_paths(rootsbindir, 'init')) -# +# # exe = executable('systemd-analyze', # systemd_analyze_sources, # include_directories : includes, @@ -1698,7 +1698,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # executable('systemd-journald', # systemd_journald_sources, # include_directories : includes, @@ -1711,7 +1711,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-cat', # systemd_cat_sources, # include_directories : includes, @@ -1721,7 +1721,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('journalctl', # journalctl_sources, # include_directories : includes, @@ -1735,7 +1735,7 @@ test_dlopen = executable( # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # executable('systemd-getty-generator', # 'src/getty-generator/getty-generator.c', # include_directories : includes, @@ -1743,7 +1743,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-debug-generator', # 'src/debug-generator/debug-generator.c', # include_directories : includes, @@ -1751,7 +1751,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-fstab-generator', # 'src/fstab-generator/fstab-generator.c', # 'src/core/mount-setup.c', @@ -1760,7 +1760,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # if conf.get('ENABLE_ENVIRONMENT_D') == 1 # executable('30-systemd-environment-d-generator', # 'src/environment-d-generator/environment-d-generator.c', @@ -1769,12 +1769,12 @@ test_dlopen = executable( # 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') == 1 # executable('systemd-hibernate-resume-generator', # 'src/hibernate-resume/hibernate-resume-generator.c', @@ -1783,7 +1783,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-hibernate-resume', # 'src/hibernate-resume/hibernate-resume.c', # include_directories : includes, @@ -1792,7 +1792,7 @@ test_dlopen = executable( # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('HAVE_BLKID') == 1 # executable('systemd-gpt-auto-generator', # 'src/gpt-auto-generator/gpt-auto-generator.c', @@ -1803,7 +1803,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # exe = executable('systemd-dissect', # 'src/dissect/dissect.c', # include_directories : includes, @@ -1813,7 +1813,7 @@ test_dlopen = executable( # install_dir : rootlibexecdir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_RESOLVE') == 1 # executable('systemd-resolved', # systemd_resolved_sources, @@ -1828,7 +1828,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-resolve', # systemd_resolve_sources, # include_directories : includes, @@ -1843,7 +1843,7 @@ test_dlopen = executable( # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_LOGIND') == 1 # executable('systemd-logind', # systemd_logind_sources, @@ -1855,7 +1855,7 @@ test_dlopen = executable( # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('loginctl', # loginctl_sources, # include_directories : includes, @@ -1867,7 +1867,7 @@ test_dlopen = executable( # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # exe = executable('systemd-inhibit', # 'src/login/inhibit.c', # include_directories : includes, @@ -1876,7 +1876,7 @@ test_dlopen = executable( # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # if conf.get('HAVE_PAM') == 1 # version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym) # pam_systemd = shared_library( @@ -1894,7 +1894,7 @@ test_dlopen = executable( # 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 @@ -1967,7 +1967,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1 # exe = executable('bootctl', # 'src/boot/bootctl.c', @@ -1978,7 +1978,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # exe = executable('systemd-socket-activate', 'src/activate/activate.c', # include_directories : includes, # link_with : [libshared], @@ -1986,7 +1986,7 @@ endif # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemctl', 'src/systemctl/systemctl.c', # include_directories : includes, # link_with : [libshared], @@ -1999,13 +1999,13 @@ endif # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # foreach alias : ['halt', 'poweroff', 'reboot', 'runlevel', 'shutdown', 'telinit'] # meson.add_install_script(meson_make_symlink, # join_paths(rootbindir, 'systemctl'), # join_paths(rootsbindir, alias)) # endforeach -# +# # if conf.get('ENABLE_BACKLIGHT') == 1 # executable('systemd-backlight', # 'src/backlight/backlight.c', @@ -2015,7 +2015,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_RFKILL') == 1 # executable('systemd-rfkill', # 'src/rfkill/rfkill.c', @@ -2025,7 +2025,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # executable('systemd-system-update-generator', # 'src/system-update-generator/system-update-generator.c', # include_directories : includes, @@ -2033,7 +2033,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # if conf.get('HAVE_LIBCRYPTSETUP') == 1 # executable('systemd-cryptsetup', # 'src/cryptsetup/cryptsetup.c', @@ -2043,7 +2043,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-cryptsetup-generator', # 'src/cryptsetup/cryptsetup-generator.c', # include_directories : includes, @@ -2052,7 +2052,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : systemgeneratordir) -# +# # executable('systemd-veritysetup', # 'src/veritysetup/veritysetup.c', # include_directories : includes, @@ -2061,7 +2061,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-veritysetup-generator', # 'src/veritysetup/veritysetup-generator.c', # include_directories : includes, @@ -2071,7 +2071,7 @@ endif # install : true, # install_dir : systemgeneratordir) # endif -# +# # if conf.get('HAVE_SYSV_COMPAT') == 1 # executable('systemd-sysv-generator', # 'src/sysv-generator/sysv-generator.c', @@ -2080,7 +2080,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, @@ -2089,7 +2089,7 @@ endif # install : true, # install_dir : systemgeneratordir) # endif -# +# # if conf.get('ENABLE_HOSTNAMED') == 1 # executable('systemd-hostnamed', # 'src/hostname/hostnamed.c', @@ -2098,7 +2098,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('hostnamectl', # 'src/hostname/hostnamectl.c', # include_directories : includes, @@ -2107,7 +2107,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_LOCALED') == 1 # if conf.get('HAVE_XKBCOMMON') == 1 # # logind will load libxkbcommon.so dynamically on its own @@ -2115,7 +2115,7 @@ endif # else # deps = [] # endif -# +# # executable('systemd-localed', # systemd_localed_sources, # include_directories : includes, @@ -2124,7 +2124,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('localectl', # localectl_sources, # include_directories : includes, @@ -2133,7 +2133,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_TIMEDATED') == 1 # executable('systemd-timedated', # 'src/timedate/timedated.c', @@ -2142,7 +2142,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('timedatectl', # 'src/timedate/timedatectl.c', # include_directories : includes, @@ -2151,7 +2151,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_TIMESYNCD') == 1 # executable('systemd-timesyncd', # systemd_timesyncd_sources, @@ -2163,7 +2163,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_MACHINED') == 1 # executable('systemd-machined', # systemd_machined_sources, @@ -2173,7 +2173,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('machinectl', # 'src/machine/machinectl.c', # include_directories : includes, @@ -2186,7 +2186,7 @@ endif # install_dir : rootbindir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_IMPORTD') == 1 # executable('systemd-importd', # systemd_importd_sources, @@ -2196,7 +2196,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # systemd_pull = executable('systemd-pull', # systemd_pull_sources, # include_directories : includes, @@ -2209,7 +2209,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # systemd_import = executable('systemd-import', # systemd_import_sources, # include_directories : includes, @@ -2221,7 +2221,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # systemd_export = executable('systemd-export', # systemd_export_sources, # include_directories : includes, @@ -2235,7 +2235,7 @@ endif # install_dir : rootlibexecdir) # public_programs += [systemd_pull, systemd_import, systemd_export] # endif -# +# # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 # exe = executable('systemd-journal-upload', # systemd_journal_upload_sources, @@ -2251,7 +2251,7 @@ endif # install_dir : rootlibexecdir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 # s_j_remote = executable('systemd-journal-remote', # systemd_journal_remote_sources, @@ -2265,7 +2265,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # s_j_gatewayd = executable('systemd-journal-gatewayd', # systemd_journal_gatewayd_sources, # include_directories : includes, @@ -2280,7 +2280,7 @@ endif # install_dir : rootlibexecdir) # public_programs += [s_j_remote, s_j_gatewayd] # endif -# +# # if conf.get('ENABLE_COREDUMP') == 1 # executable('systemd-coredump', # systemd_coredump_sources, @@ -2294,7 +2294,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('coredumpctl', # coredumpctl_sources, # include_directories : includes, @@ -2306,7 +2306,7 @@ endif # install : true) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_BINFMT') == 1 # exe = executable('systemd-binfmt', # 'src/binfmt/binfmt.c', @@ -2316,13 +2316,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') == 1 # executable('systemd-vconsole-setup', # 'src/vconsole/vconsole-setup.c', @@ -2332,7 +2332,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_RANDOMSEED') == 1 # executable('systemd-random-seed', # 'src/random-seed/random-seed.c', @@ -2342,7 +2342,7 @@ endif # install : true, # install_dir : rootlibexecdir) # endif -# +# # if conf.get('ENABLE_FIRSTBOOT') == 1 # executable('systemd-firstboot', # 'src/firstboot/firstboot.c', @@ -2353,7 +2353,7 @@ endif # install : true, # install_dir : rootbindir) # endif -# +# # executable('systemd-remount-fs', # 'src/remount-fs/remount-fs.c', # 'src/core/mount-setup.c', @@ -2363,7 +2363,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', @@ -2373,7 +2373,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootbindir) -# +# # executable('systemd-fsck', # 'src/fsck/fsck.c', # include_directories : includes, @@ -2381,7 +2381,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('elogind-growfs', # 'src/partition/growfs.c', # include_directories : includes, @@ -2390,7 +2390,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('elogind-makefs', # 'src/partition/makefs.c', # include_directories : includes, @@ -2398,7 +2398,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-sleep', # 'src/sleep/sleep.c', # include_directories : includes, @@ -2406,7 +2406,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-sysctl', # 'src/sysctl/sysctl.c', # include_directories : includes, @@ -2415,7 +2415,7 @@ endif # install : true, # install_dir : rootlibexecdir) # public_programs += [exe] -# +# # executable('systemd-ac-power', # 'src/ac-power/ac-power.c', # include_directories : includes, @@ -2423,7 +2423,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('systemd-detect-virt', # 'src/detect-virt/detect-virt.c', # include_directories : includes, @@ -2431,7 +2431,7 @@ endif # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemd-delta', # 'src/delta/delta.c', # include_directories : includes, @@ -2439,7 +2439,7 @@ endif # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemd-escape', # 'src/escape/escape.c', # include_directories : includes, @@ -2448,7 +2448,7 @@ endif # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # exe = executable('systemd-notify', # 'src/notify/notify.c', # include_directories : includes, @@ -2457,7 +2457,7 @@ endif # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # executable('systemd-volatile-root', # 'src/volatile-root/volatile-root.c', # include_directories : includes, @@ -2465,7 +2465,7 @@ endif # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # executable('systemd-cgroups-agent', # 'src/cgroups-agent/cgroups-agent.c', # include_directories : includes, @@ -2491,7 +2491,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, @@ -2500,7 +2500,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, @@ -2508,7 +2508,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, @@ -2517,7 +2517,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # exe = executable('systemd-cgls', # 'src/cgls/cgls.c', # include_directories : includes, @@ -2525,7 +2525,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # exe = executable('systemd-cgtop', # 'src/cgtop/cgtop.c', # include_directories : includes, @@ -2533,7 +2533,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # executable('systemd-initctl', # 'src/initctl/initctl.c', # include_directories : includes, @@ -2541,7 +2541,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, @@ -2549,10 +2549,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, @@ -2560,7 +2560,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, @@ -2568,7 +2568,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', @@ -2578,7 +2578,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # if conf.get('ENABLE_SYSUSERS') == 1 # exe = executable('systemd-sysusers', # 'src/sysusers/sysusers.c', @@ -2589,7 +2589,7 @@ executable('elogind-cgroups-agent', # install_dir : rootbindir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_TMPFILES') == 1 # exe = executable('systemd-tmpfiles', # 'src/tmpfiles/tmpfiles.c', @@ -2600,13 +2600,13 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # test('test-systemd-tmpfiles', # test_systemd_tmpfiles_py, # args : exe.full_path()) # # https://github.com/mesonbuild/meson/issues/2681 # endif -# +# # if conf.get('ENABLE_HWDB') == 1 # exe = executable('systemd-hwdb', # 'src/hwdb/hwdb.c', @@ -2618,7 +2618,7 @@ executable('elogind-cgroups-agent', # install_dir : rootbindir) # public_programs += [exe] # endif -# +# # if conf.get('ENABLE_QUOTACHECK') == 1 # executable('systemd-quotacheck', # 'src/quotacheck/quotacheck.c', @@ -2628,7 +2628,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, @@ -2638,7 +2638,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootlibexecdir) # public_programs += [exe] -# +# # exe = executable('systemd-udevd', # systemd_udevd_sources, # include_directories : includes, @@ -2655,7 +2655,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootlibexecdir) # public_programs += [exe] -# +# # exe = executable('udevadm', # udevadm_sources, # c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], @@ -2672,7 +2672,7 @@ executable('elogind-cgroups-agent', # install : true, # install_dir : rootbindir) # public_programs += [exe] -# +# # executable('systemd-shutdown', # systemd_shutdown_sources, # include_directories : includes, @@ -2680,7 +2680,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, @@ -2688,7 +2688,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, @@ -2697,7 +2697,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # if conf.get('HAVE_KMOD') == 1 # executable('systemd-modules-load', # 'src/modules-load/modules-load.c', @@ -2707,13 +2707,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? @@ -2729,7 +2729,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true) # public_programs += [exe] -# +# # if conf.get('ENABLE_NETWORKD') == 1 # executable('systemd-networkd', # systemd_networkd_sources, @@ -2742,7 +2742,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, @@ -2751,7 +2751,7 @@ executable('elogind-cgroups-agent', # install_rpath : rootlibexecdir, # install : true, # install_dir : rootlibexecdir) -# +# # exe = executable('networkctl', # networkctl_sources, # include_directories : includes, @@ -2762,7 +2762,7 @@ executable('elogind-cgroups-agent', # install_dir : rootbindir) # public_programs += [exe] # endif -# +# # executable('systemd-sulogin-shell', # ['src/sulogin-shell/sulogin-shell.c'], # include_directories : includes, @@ -2838,7 +2838,7 @@ endforeach # install_dir : testsdir) # test('test-libsystemd-sym', # test_libsystemd_sym) -# +# # test_libudev_sym = executable( # 'test-libudev-sym', # test_libudev_sym_c, @@ -2849,26 +2849,26 @@ endforeach # install_dir : testsdir) # test('test-libudev-sym', # test_libudev_sym) -# +# # ############################################################ -# +# # fuzzer_exes = [] -# +# # foreach tuple : fuzzers # sources = tuple[0] # link_with = tuple[1].length() > 0 ? tuple[1] : [libshared] # dependencies = tuple[2] # defs = tuple.length() >= 4 ? tuple[3] : [] # incs = tuple.length() >= 5 ? tuple[4] : includes -# +# # if fuzzer_build # dependencies += fuzzing_engine # else # sources += 'src/fuzz/fuzz-main.c' # endif -# +# # name = sources[0].split('/')[-1].split('.')[0] -# +# # fuzzer_exes += executable( # name, # sources, @@ -2878,13 +2878,13 @@ endforeach # c_args : defs, # install : false) # endforeach -# +# # run_target('fuzzers', # depends : fuzzer_exes, # command : ['true']) -# +# # ############################################################ -# +# #else test_libelogind_sym = executable( 'test-libelogind-sym', @@ -2901,7 +2901,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') @@ -2970,15 +2970,15 @@ endforeach # a = p.split('/')[-3] # b = p.split('/')[-2] # c = p.split('/')[-1] -# +# # if a == 'address' # build = sanitize_address # else # error('unknown sanitizer @0@'.format(a)) # endif -# +# # name = '@1@:@0@'.format(a, b) -# +# # if name != prev # if want_tests == 'false' # message('Not compiling @0@ because tests is set to false'.format(name)) @@ -2998,7 +2998,7 @@ endforeach # endif # endif # prev = name -# +# # if want_tests != 'false' and slow_tests # test(c, env, args : [exe.full_path(), # join_paths(meson.source_root(), @@ -3122,7 +3122,7 @@ status = [ # 'nobody group name: @0@'.format(nobody_group), # 'fallback hostname: @0@'.format(get_option('fallback-hostname')), # 'symbolic gateway hostnames: @0@'.format(', '.join(gateway_hostnames)), -# +# # 'default DNSSEC mode: @0@'.format(default_dnssec), # 'default cgroup hierarchy: @0@'.format(default_hierarchy), #endif // 0 @@ -3134,7 +3134,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 += [ @@ -3150,7 +3150,7 @@ status = [ # if conf.get('ENABLE_EFI') == 1 # status += [ # 'efi arch: @0@'.format(efi_arch)] -# +# # if have_gnu_efi # status += [ # 'EFI machine type: @0@'.format(EFI_MACHINE_TYPE_NAME), @@ -3257,8 +3257,9 @@ foreach tuple : [ ['debug mmap cache'], ] - cond = tuple.get(1, false) - if cond == false + if tuple.length() >= 2 + cond = tuple[1] + else ident1 = 'HAVE_' + tuple[0].underscorify().to_upper() ident2 = 'ENABLE_' + tuple[0].underscorify().to_upper() cond = conf.get(ident1, 0) == 1 or conf.get(ident2, 0) == 1 diff --git a/pwx_local/last_mutual_commits.csv b/pwx_local/last_mutual_commits.csv index 8f93ef4fd..1644c6ad6 100644 --- a/pwx_local/last_mutual_commits.csv +++ b/pwx_local/last_mutual_commits.csv @@ -9,7 +9,7 @@ ../systemd-stable v235-stable b3e823e43 x x ../systemd-stable v236-stable b3e823e43 x x ../systemd-stable v237-stable 7909254c7 src-7909254c7 tgt-6770df07e -../systemd-stable v238-stable c657bff1d x x +../systemd-stable v238-stable 1394c16f3 src-f58e62cbb tgt-a30ed9578 ../systemd-upstream master 265710c20 src-efaa3176a x ../systemd-upstream v234 d6d0473dc src-782c925f7 x ../systemd-upstream v236 83fefc888 src-f78a88bec x