shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-12 08:58:20 +03:00
Code

rpm/macros: add %_kernel_install_dir

Browse Source 
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.

(cherry picked from commit 5248a0c5b344c0b8cb18dee5206836cd61e6bd46)
(cherry picked from commit b25bd391892112527597d00b82e96f0f0b6399ea)
(cherry picked from commit 2a34c7d60dbb37935169f903246b420f354aa114)
(cherry picked from commit c520a830f98a008526f78c3d065d4ef0629d4e57)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-02-29 21:38:03 +01:00 committed by Luca Boccassi
parent 271e145d64
commit 9327d318c4
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -240,6 +240,7 @@ conf.set_quoted('DOCUMENT_ROOT', pkgdatadir / 'gate
conf.set_quoted('ENVIRONMENT_DIR', environmentdir)
conf.set_quoted('INCLUDE_DIR', includedir)
conf.set_quoted('LIBDIR', libdir)
conf.set_quoted('KERNEL_INSTALL_DIR', kernelinstalldir)
conf.set_quoted('MODPROBE_DIR', modprobedir)
conf.set_quoted('MODULESLOAD_DIR', modulesloaddir)
conf.set_quoted('PKGSYSCONFDIR', pkgsysconfdir)

1
src/rpm/macros.systemd.in
View File

@ -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}}