Merge pull request #31551 from keszybz/rpm-macro-kernel-install

New rpm macro %_kernel_install_dir
2024-03-01 00:44:52 +00:00
parent 1e18e1aa11 5248a0c5b3
commit 7a2ba85aee
2 changed files with 2 additions and 4 deletions
@@ -232,6 +232,7 @@ conf.set_quoted('ENVIRONMENT_DIR',                            environmentdir)
 conf.set_quoted('INCLUDE_DIR',                                includedir)
 conf.set_quoted('LIBDIR',                                     libdir)
 conf.set_quoted('LIBEXECDIR',                                 libexecdir)
+conf.set_quoted('KERNEL_INSTALL_DIR',                         kernelinstalldir)
 conf.set_quoted('MODPROBE_DIR',                               modprobedir)
 conf.set_quoted('MODULESLOAD_DIR',                            modulesloaddir)
 conf.set_quoted('PKGSYSCONFDIR',                              pkgsysconfdir)
@@ -13,6 +13,7 @@
 %_udevhwdbdir {{UDEV_HWDB_DIR}}
 %_udevrulesdir {{UDEV_RULES_DIR}}
 %_journalcatalogdir {{SYSTEMD_CATALOG_DIR}}
+%_kernel_install_dir {{KERNEL_INSTALL_DIR}}
 %_binfmtdir {{BINFMT_DIR}}
 %_sysctldir {{SYSCTL_DIR}}
 %_sysusersdir {{SYSUSERS_DIR}}
@@ -26,10 +27,6 @@
 %_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)
-%_environmnentdir %{warn:Use %%_environmentdir instead}%_environmentdir
-
 %systemd_requires \
 Requires(post): systemd \
 Requires(preun): systemd \