rpm: update RPM macros to include definitions for more drop-in directories and for reloading/rebuilding configuration

More specifically this adds a number of macros that resolve to
directories for udev rules, hwdb entries, tmpfiles and sysctl.

Thsi also includes three new macros for rebuilding the hwbd/catalog
index when a package drops in new files
This commit is contained in:
Lennart Poettering 2012-11-16 19:54:19 +01:00
parent 7c670f5b44
commit 1b0fcd7411
2 changed files with 22 additions and 0 deletions

View File

@ -3750,6 +3750,11 @@ SED_PROCESS = \
-e 's,@userunitdir\@,$(userunitdir),g' \
-e 's,@systempresetdir\@,$(systempresetdir),g' \
-e 's,@userpresetdir\@,$(userpresetdir),g' \
-e 's,@udevhwdbdir\@,$(udevhwdbdir),g' \
-e 's,@udevrulesdir\@,$(udevrulesdir),g' \
-e 's,@catalogdir\@,$(catalogdir),g' \
-e 's,@tmpfilesdir\@,$(tmpfilesdir),g' \
-e 's,@sysctldir\@,$(sysctldir),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \

View File

@ -21,6 +21,11 @@
%_unitdir @systemunitdir@
%_presetdir @systempresetdir@
%_udevhwdbdir @udevhwdbdir@
%_udevrulesdir @udevrulesdir@
%_journalcatalogdir @catalogdir@
%_tmpfilesdir @tmpfilesdir@
%_sysctldir @sysctldir@
%systemd_requires \
Requires(post): systemd \
@ -54,3 +59,15 @@ if [ $1 -ge 1 ] ; then \
@rootbindir@/systemctl try-restart %{?*} >/dev/null 2>&1 || : \
fi \
%{nil}
%udev_hwdb_update() \
@rootbindir@/udevadm hwdb --update >/dev/null 2>&1 || : \
%{nil}
%udev_rules_update() \
@rootbindir@/udevadm control --reload >/dev/null 2>&1 || : \
%{nil}
%journal_catalog_update() \
@rootbindir@/journalctl --update-catalog >/dev/null 2>&1 || : \
%{nil}