mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
meson: sort conf paths alphabetically
The order was a complete mess. Let's make it a bit more tidy.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
Yu Watanabe
parent
23b8071d47
commit
491bf10c80
115
meson.build
115
meson.build
@ -211,75 +211,74 @@ endif
|
|||||||
memory_accounting_default = get_option('memory-accounting-default')
|
memory_accounting_default = get_option('memory-accounting-default')
|
||||||
status_unit_format_default = get_option('status-unit-format-default')
|
status_unit_format_default = get_option('status-unit-format-default')
|
||||||
|
|
||||||
conf.set_quoted('SYSCONF_DIR', sysconfdir)
|
conf.set_quoted('BINFMT_DIR', binfmtdir)
|
||||||
|
conf.set_quoted('BOOTLIBDIR', bootlibdir)
|
||||||
|
conf.set_quoted('CATALOG_DATABASE', join_paths(catalogstatedir, 'database'))
|
||||||
|
conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root'))
|
||||||
|
conf.set_quoted('DOCUMENT_ROOT', join_paths(pkgdatadir, 'gatewayd'))
|
||||||
|
conf.set_quoted('ENVIRONMENT_DIR', environmentdir)
|
||||||
|
conf.set_quoted('INCLUDE_DIR', includedir)
|
||||||
|
conf.set_quoted('LIBDIR', libdir)
|
||||||
|
conf.set_quoted('MODPROBE_DIR', modprobedir)
|
||||||
|
conf.set_quoted('MODULESLOAD_DIR', modulesloaddir)
|
||||||
conf.set_quoted('PKGSYSCONFDIR', pkgsysconfdir)
|
conf.set_quoted('PKGSYSCONFDIR', pkgsysconfdir)
|
||||||
|
conf.set_quoted('POLKIT_AGENT_BINARY_PATH', join_paths(bindir, 'pkttyagent'))
|
||||||
|
conf.set_quoted('PREFIX', prefixdir)
|
||||||
|
conf.set_quoted('RANDOM_SEED', join_paths(randomseeddir, 'random-seed'))
|
||||||
|
conf.set_quoted('RANDOM_SEED_DIR', randomseeddir)
|
||||||
|
conf.set_quoted('RC_LOCAL_PATH', get_option('rc-local'))
|
||||||
|
conf.set_quoted('ROOTBINDIR', rootbindir)
|
||||||
|
conf.set_quoted('ROOTLIBDIR', rootlibdir)
|
||||||
|
conf.set_quoted('ROOTLIBEXECDIR', rootlibexecdir)
|
||||||
|
conf.set_quoted('ROOTPREFIX', rootprefixdir)
|
||||||
|
conf.set_quoted('ROOTPREFIX_NOSLASH', rootprefixdir_noslash)
|
||||||
|
conf.set_quoted('SYSCONF_DIR', sysconfdir)
|
||||||
|
conf.set_quoted('SYSCTL_DIR', sysctldir)
|
||||||
|
conf.set_quoted('SYSTEMCTL_BINARY_PATH', join_paths(rootbindir, 'systemctl'))
|
||||||
|
conf.set_quoted('SYSTEMD_BINARY_PATH', join_paths(rootlibexecdir, 'systemd'))
|
||||||
|
conf.set_quoted('SYSTEMD_CATALOG_DIR', catalogdir)
|
||||||
|
conf.set_quoted('SYSTEMD_CGROUPS_AGENT_PATH', join_paths(rootlibexecdir, 'systemd-cgroups-agent'))
|
||||||
|
conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH', join_paths(rootlibexecdir, 'systemd-cryptsetup'))
|
||||||
|
conf.set_quoted('SYSTEMD_EXPORT_PATH', join_paths(rootlibexecdir, 'systemd-export'))
|
||||||
|
conf.set_quoted('SYSTEMD_FSCK_PATH', join_paths(rootlibexecdir, 'systemd-fsck'))
|
||||||
|
conf.set_quoted('SYSTEMD_GROWFS_PATH', join_paths(rootlibexecdir, 'systemd-growfs'))
|
||||||
|
conf.set_quoted('SYSTEMD_HOMEWORK_PATH', join_paths(rootlibexecdir, 'systemd-homework'))
|
||||||
|
conf.set_quoted('SYSTEMD_IMPORT_FS_PATH', join_paths(rootlibexecdir, 'systemd-import-fs'))
|
||||||
|
conf.set_quoted('SYSTEMD_IMPORT_PATH', join_paths(rootlibexecdir, 'systemd-import'))
|
||||||
|
conf.set_quoted('SYSTEMD_KBD_MODEL_MAP', join_paths(pkgdatadir, 'kbd-model-map'))
|
||||||
|
conf.set_quoted('SYSTEMD_LANGUAGE_FALLBACK_MAP', join_paths(pkgdatadir, 'language-fallback-map'))
|
||||||
|
conf.set_quoted('SYSTEMD_MAKEFS_PATH', join_paths(rootlibexecdir, 'systemd-makefs'))
|
||||||
|
conf.set_quoted('SYSTEMD_PULL_PATH', join_paths(rootlibexecdir, 'systemd-pull'))
|
||||||
|
conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH', join_paths(rootlibexecdir, 'systemd-shutdown'))
|
||||||
|
conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH', join_paths(bindir, 'systemd-stdio-bridge'))
|
||||||
|
conf.set_quoted('SYSTEMD_TEST_DATA', join_paths(testsdir, 'testdata'))
|
||||||
|
conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
|
||||||
|
conf.set_quoted('SYSTEMD_USERWORK_PATH', join_paths(rootlibexecdir, 'systemd-userwork'))
|
||||||
|
conf.set_quoted('SYSTEMD_VERITYSETUP_PATH', join_paths(rootlibexecdir, 'systemd-veritysetup'))
|
||||||
conf.set_quoted('SYSTEM_CONFIG_UNIT_DIR', join_paths(pkgsysconfdir, 'system'))
|
conf.set_quoted('SYSTEM_CONFIG_UNIT_DIR', join_paths(pkgsysconfdir, 'system'))
|
||||||
conf.set_quoted('SYSTEM_DATA_UNIT_DIR', systemunitdir)
|
conf.set_quoted('SYSTEM_DATA_UNIT_DIR', systemunitdir)
|
||||||
|
conf.set_quoted('SYSTEM_ENV_GENERATOR_DIR', systemenvgeneratordir)
|
||||||
|
conf.set_quoted('SYSTEM_GENERATOR_DIR', systemgeneratordir)
|
||||||
conf.set_quoted('SYSTEM_PRESET_DIR', systempresetdir)
|
conf.set_quoted('SYSTEM_PRESET_DIR', systempresetdir)
|
||||||
conf.set_quoted('USER_PRESET_DIR', userpresetdir)
|
conf.set_quoted('SYSTEM_SHUTDOWN_PATH', systemshutdowndir)
|
||||||
|
conf.set_quoted('SYSTEM_SLEEP_PATH', systemsleepdir)
|
||||||
conf.set_quoted('SYSTEM_SYSVINIT_PATH', sysvinit_path)
|
conf.set_quoted('SYSTEM_SYSVINIT_PATH', sysvinit_path)
|
||||||
conf.set_quoted('SYSTEM_SYSVRCND_PATH', sysvrcnd_path)
|
conf.set_quoted('SYSTEM_SYSVRCND_PATH', sysvrcnd_path)
|
||||||
|
conf.set_quoted('SYSUSERS_DIR', sysusersdir)
|
||||||
|
conf.set_quoted('TMPFILES_DIR', tmpfilesdir)
|
||||||
|
conf.set_quoted('UDEVLIBEXECDIR', udevlibexecdir)
|
||||||
conf.set_quoted('UDEV_HWDB_DIR', udevhwdbdir)
|
conf.set_quoted('UDEV_HWDB_DIR', udevhwdbdir)
|
||||||
conf.set_quoted('UDEV_RULES_DIR', udevrulesdir)
|
conf.set_quoted('UDEV_RULES_DIR', udevrulesdir)
|
||||||
conf.set_quoted('RC_LOCAL_PATH', get_option('rc-local'))
|
conf.set_quoted('USER_CONFIG_UNIT_DIR', join_paths(pkgsysconfdir, 'user'))
|
||||||
|
conf.set_quoted('USER_DATA_UNIT_DIR', userunitdir)
|
||||||
|
conf.set_quoted('USER_ENV_GENERATOR_DIR', userenvgeneratordir)
|
||||||
|
conf.set_quoted('USER_GENERATOR_DIR', usergeneratordir)
|
||||||
|
conf.set_quoted('USER_KEYRING_PATH', join_paths(pkgsysconfdir, 'import-pubring.gpg'))
|
||||||
|
conf.set_quoted('USER_PRESET_DIR', userpresetdir)
|
||||||
|
conf.set_quoted('VENDOR_KEYRING_PATH', join_paths(rootlibexecdir, 'import-pubring.gpg'))
|
||||||
|
|
||||||
conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper())
|
conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper())
|
||||||
conf.set10('ENABLE_FEXECVE', get_option('fexecve'))
|
conf.set10('ENABLE_FEXECVE', get_option('fexecve'))
|
||||||
|
|
||||||
conf.set_quoted('USER_CONFIG_UNIT_DIR', join_paths(pkgsysconfdir, 'user'))
|
|
||||||
conf.set_quoted('USER_DATA_UNIT_DIR', userunitdir)
|
|
||||||
conf.set_quoted('CERTIFICATE_ROOT', get_option('certificate-root'))
|
|
||||||
conf.set_quoted('CATALOG_DATABASE', join_paths(catalogstatedir, 'database'))
|
|
||||||
conf.set_quoted('SYSTEMD_BINARY_PATH', join_paths(rootlibexecdir, 'systemd'))
|
|
||||||
conf.set_quoted('SYSTEMD_CGROUPS_AGENT_PATH', join_paths(rootlibexecdir, 'systemd-cgroups-agent'))
|
|
||||||
conf.set_quoted('SYSTEMD_FSCK_PATH', join_paths(rootlibexecdir, 'systemd-fsck'))
|
|
||||||
conf.set_quoted('SYSTEMD_GROWFS_PATH', join_paths(rootlibexecdir, 'systemd-growfs'))
|
|
||||||
conf.set_quoted('SYSTEMD_MAKEFS_PATH', join_paths(rootlibexecdir, 'systemd-makefs'))
|
|
||||||
conf.set_quoted('SYSTEMD_SHUTDOWN_BINARY_PATH', join_paths(rootlibexecdir, 'systemd-shutdown'))
|
|
||||||
conf.set_quoted('SYSTEMCTL_BINARY_PATH', join_paths(rootbindir, 'systemctl'))
|
|
||||||
conf.set_quoted('SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH', join_paths(rootbindir, 'systemd-tty-ask-password-agent'))
|
|
||||||
conf.set_quoted('SYSTEMD_STDIO_BRIDGE_BINARY_PATH', join_paths(bindir, 'systemd-stdio-bridge'))
|
|
||||||
conf.set_quoted('ROOTBINDIR', rootbindir)
|
|
||||||
conf.set_quoted('ROOTPREFIX', rootprefixdir)
|
|
||||||
conf.set_quoted('PREFIX', prefixdir)
|
|
||||||
conf.set_quoted('ROOTPREFIX_NOSLASH', rootprefixdir_noslash)
|
|
||||||
conf.set_quoted('RANDOM_SEED_DIR', randomseeddir)
|
|
||||||
conf.set_quoted('RANDOM_SEED', join_paths(randomseeddir, 'random-seed'))
|
|
||||||
conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH', join_paths(rootlibexecdir, 'systemd-cryptsetup'))
|
|
||||||
conf.set_quoted('SYSTEMD_VERITYSETUP_PATH', join_paths(rootlibexecdir, 'systemd-veritysetup'))
|
|
||||||
conf.set_quoted('SYSTEM_GENERATOR_DIR', systemgeneratordir)
|
|
||||||
conf.set_quoted('USER_GENERATOR_DIR', usergeneratordir)
|
|
||||||
conf.set_quoted('SYSTEM_ENV_GENERATOR_DIR', systemenvgeneratordir)
|
|
||||||
conf.set_quoted('USER_ENV_GENERATOR_DIR', userenvgeneratordir)
|
|
||||||
conf.set_quoted('SYSTEM_SHUTDOWN_PATH', systemshutdowndir)
|
|
||||||
conf.set_quoted('SYSTEM_SLEEP_PATH', systemsleepdir)
|
|
||||||
conf.set_quoted('SYSTEMD_KBD_MODEL_MAP', join_paths(pkgdatadir, 'kbd-model-map'))
|
|
||||||
conf.set_quoted('SYSTEMD_LANGUAGE_FALLBACK_MAP', join_paths(pkgdatadir, 'language-fallback-map'))
|
|
||||||
conf.set_quoted('SYSTEMD_TEST_DATA', join_paths(testsdir, 'testdata'))
|
|
||||||
conf.set_quoted('SYSTEMD_CATALOG_DIR', catalogdir)
|
|
||||||
conf.set_quoted('BINFMT_DIR', binfmtdir)
|
|
||||||
conf.set_quoted('SYSCTL_DIR', sysctldir)
|
|
||||||
conf.set_quoted('SYSUSERS_DIR', sysusersdir)
|
|
||||||
conf.set_quoted('TMPFILES_DIR', tmpfilesdir)
|
|
||||||
conf.set_quoted('ENVIRONMENT_DIR', environmentdir)
|
|
||||||
conf.set_quoted('MODULESLOAD_DIR', modulesloaddir)
|
|
||||||
conf.set_quoted('MODPROBE_DIR', modprobedir)
|
|
||||||
conf.set_quoted('UDEVLIBEXECDIR', udevlibexecdir)
|
|
||||||
conf.set_quoted('POLKIT_AGENT_BINARY_PATH', join_paths(bindir, 'pkttyagent'))
|
|
||||||
conf.set_quoted('LIBDIR', libdir)
|
|
||||||
conf.set_quoted('ROOTLIBDIR', rootlibdir)
|
|
||||||
conf.set_quoted('ROOTLIBEXECDIR', rootlibexecdir)
|
|
||||||
conf.set_quoted('BOOTLIBDIR', bootlibdir)
|
|
||||||
conf.set_quoted('INCLUDE_DIR', includedir)
|
|
||||||
conf.set_quoted('SYSTEMD_PULL_PATH', join_paths(rootlibexecdir, 'systemd-pull'))
|
|
||||||
conf.set_quoted('SYSTEMD_IMPORT_PATH', join_paths(rootlibexecdir, 'systemd-import'))
|
|
||||||
conf.set_quoted('SYSTEMD_IMPORT_FS_PATH', join_paths(rootlibexecdir, 'systemd-import-fs'))
|
|
||||||
conf.set_quoted('SYSTEMD_EXPORT_PATH', join_paths(rootlibexecdir, 'systemd-export'))
|
|
||||||
conf.set_quoted('VENDOR_KEYRING_PATH', join_paths(rootlibexecdir, 'import-pubring.gpg'))
|
|
||||||
conf.set_quoted('USER_KEYRING_PATH', join_paths(pkgsysconfdir, 'import-pubring.gpg'))
|
|
||||||
conf.set_quoted('DOCUMENT_ROOT', join_paths(pkgdatadir, 'gatewayd'))
|
|
||||||
conf.set_quoted('SYSTEMD_HOMEWORK_PATH', join_paths(rootlibexecdir, 'systemd-homework'))
|
|
||||||
conf.set_quoted('SYSTEMD_USERWORK_PATH', join_paths(rootlibexecdir, 'systemd-userwork'))
|
|
||||||
conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default)
|
conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default)
|
||||||
conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())
|
conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())
|
||||||
conf.set_quoted('STATUS_UNIT_FORMAT_DEFAULT_STR', status_unit_format_default)
|
conf.set_quoted('STATUS_UNIT_FORMAT_DEFAULT_STR', status_unit_format_default)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user