From 5248a0c5b344c0b8cb18dee5206836cd61e6bd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 29 Feb 2024 21:38:03 +0100 Subject: [PATCH] rpm/macros: add %_kernel_install_dir This makes it easier for people packaging kernel-install plugins to get the path right. E.g. https://src.fedoraproject.org/rpms/python-virt-firmware/pull-request/3 fixes an issue where %{_libdir}/kernel/install.d was used, which gives incorrect results on 64-bit architectures. %_kernel_install_dir will make this even easier. --- meson.build | 1 + src/rpm/macros.systemd.in | 1 + 2 files changed, 2 insertions(+) diff --git a/meson.build b/meson.build index e27e944caf..d4e89eae01 100644 --- a/meson.build +++ b/meson.build @@ -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) diff --git a/src/rpm/macros.systemd.in b/src/rpm/macros.systemd.in index 8b9c0583f7..ce65ec6700 100644 --- a/src/rpm/macros.systemd.in +++ b/src/rpm/macros.systemd.in @@ -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}}