diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-16 16:44:47 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 10:25:26 +0900 |
| commit | 835cf75aefae4402d36e202aad453a98d36b1482 (patch) | |
| tree | 7169cf1cebbf4de1145997096a0c789a15ddcab5 /src/rpm/macros.systemd.in | |
| parent | d0f8006993deb976071ccdef823c61bdd1b9bbfe (diff) | |
| download | systemd-835cf75aefae4402d36e202aad453a98d36b1482.tar.gz | |
meson: use jinja2 for rpm templates
The naming of variables is very inconsistent. I tried to use more
modern style naming (UNDERSCORED_TITLE_CASE), but I didn't change existing
names too much. Only SYSTEM_DATA_UNIT_PATH is renamed to SYSTEM_DATA_UNIT_DIR
to match SYSTEM_CONFIG_UNIT_DIR.
Diffstat (limited to 'src/rpm/macros.systemd.in')
| -rw-r--r-- | src/rpm/macros.systemd.in | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/rpm/macros.systemd.in b/src/rpm/macros.systemd.in index 0d27c1703a..3a0169a85f 100644 --- a/src/rpm/macros.systemd.in +++ b/src/rpm/macros.systemd.in @@ -5,25 +5,25 @@ # RPM macros for packages installing systemd unit files -%_systemd_util_dir @rootlibexecdir@ -%_unitdir @systemunitdir@ -%_userunitdir @userunitdir@ -%_presetdir @systempresetdir@ -%_userpresetdir @userpresetdir@ -%_udevhwdbdir @udevhwdbdir@ -%_udevrulesdir @udevrulesdir@ -%_journalcatalogdir @catalogdir@ -%_binfmtdir @binfmtdir@ -%_sysctldir @sysctldir@ -%_sysusersdir @sysusersdir@ -%_tmpfilesdir @tmpfilesdir@ -%_environmentdir @environmentdir@ -%_modulesloaddir @modulesloaddir@ -%_modprobedir @modprobedir@ -%_systemdgeneratordir @systemgeneratordir@ -%_systemdusergeneratordir @usergeneratordir@ -%_systemd_system_env_generator_dir @systemenvgeneratordir@ -%_systemd_user_env_generator_dir @userenvgeneratordir@ +%_systemd_util_dir {{ROOTLIBEXECDIR}} +%_unitdir {{SYSTEM_DATA_UNIT_DIR}} +%_userunitdir {{USER_DATA_UNIT_DIR}} +%_presetdir {{SYSTEM_PRESET_DIR}} +%_userpresetdir {{USER_PRESET_DIR}} +%_udevhwdbdir {{UDEV_HWDB_DIR}} +%_udevrulesdir {{UDEV_RULES_DIR}} +%_journalcatalogdir {{SYSTEMD_CATALOG_DIR}} +%_binfmtdir {{BINFMT_DIR}} +%_sysctldir {{SYSCTL_DIR}} +%_sysusersdir {{SYSUSERS_DIR}} +%_tmpfilesdir {{TMPFILES_DIR}} +%_environmentdir {{ENVIRONMENT_DIR}} +%_modulesloaddir {{MODULESLOAD_DIR}} +%_modprobedir {{MODPROBE_DIR}} +%_systemdgeneratordir {{SYSTEM_GENERATOR_DIR}} +%_systemdusergeneratordir {{USER_GENERATOR_DIR}} +%_systemd_system_env_generator_dir {{SYSTEM_ENV_GENERATOR_DIR}} +%_systemd_user_env_generator_dir {{USER_ENV_GENERATOR_DIR}} # Because we had one release with a typo... # This is temporary (Remove after systemd 240 is released) @@ -162,10 +162,10 @@ SYSTEMD_INLINE_EOF\ %sysctl_apply() \ %{expand:%%{?__systemd_someargs_%#:%%__systemd_someargs_%# sysctl_apply}} \ -[ -x @rootlibexecdir@/systemd-sysctl ] && @rootlibexecdir@/systemd-sysctl %{?*} || : \ +[ -x {{ROOTLIBEXECDIR}}/systemd-sysctl ] && {{ROOTLIBEXECDIR}}/systemd-sysctl %{?*} || : \ %{nil} %binfmt_apply() \ %{expand:%%{?__systemd_someargs_%#:%%__systemd_someargs_%# binfmt_apply}} \ -[ -x @rootlibexecdir@/systemd-binfmt ] && @rootlibexecdir@/systemd-binfmt %{?*} || : \ +[ -x {{ROOTLIBEXECDIR}}/systemd-binfmt ] && {{ROOTLIBEXECDIR}}/systemd-binfmt %{?*} || : \ %{nil} |