l=${l#/usr/share/man/}; \
l=${l#/usr/X11R6/man/}; \
else \
- l=$m; \
+ l=${a#$RPM_BUILD_ROOT$i/}; \
+ l=${l%/*}; \
+ l="$l/$m"; \
fi; \
rm -f $a; \
echo ".so $l" > $a; \
\
[ -r "%{_kernelsrcdir}/.config" ] || exit 1 \
rm -rf o \
- install -d o/include/linux o/include/generated o/arch/powerpc/lib \
+ install -d o/include/linux o/include/generated o/arch/x86/include o/arch/powerpc/lib \
ln -sf %{_kernelsrcdir}/.config o/.config \
ln -sf %{_kernelsrcdir}/Module.symvers o/Module.symvers \
if [ -f %{_kernelsrcdir}/include/generated/autoconf.h ]; then \
ln -s ../generated/autoconf.h o/include/linux/autoconf.h \
else \
ln -sf %{_kernelsrcdir}/include/linux/autoconf.h o/include/linux/autoconf.h \
+ fi \
+ if [ -d %{_kernelsrcdir}/arch/x86/include/generated ]; then \
+ ln -s %{_kernelsrcdir}/arch/x86/include/generated o/arch/x86/include \
fi \
\
set +x \
#
# Usage:
# %systemd_reload
-# %systemd_service_enable <-f> service_name1.service service_name2.service
+# %systemd_service <unit command> service_name1.service service_name2.service
+# %systemd_service_enable service_name1.service service_name2.service
# %systemd_service_disable service_name1.service service_name2.service
# %systemd_service_start service_name1.service service_name2.service
# %systemd_service_stop service_name1.service service_name2.service
# %systemd_service_restart service_name1.service service_name2.service
-# %systemd_trigger service_name1.service service_name2.service
+# %systemd_service_reload service_name1.service service_name2.service
#
# %systemd_post service_name1.service service_name2.service
# %systemd_preun service_name1.service service_name2.service
-# %systend_trigger service_name1.service service_name2.service
+# %systemd_trigger service_name1.service service_name2.service
#
# Sample:
# %post
# %systemd_trigger %{name}.service
#
# Requirements:
-# BuildRequires: rpmbuild(macros) >= 1.643
-# Requires: systemd-units >= 38-1
+# BuildRequires: rpmbuild(macros) >= 1.647
+# Requires: systemd-units >= 38
%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
/bin/systemctl --quiet disable %{*} || : \
%{nil}
+%systemd_service() \
+ export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+ /bin/systemd_booted && /bin/systemctl --quiet %{*} || : \
+%{nil}
+
%systemd_service_start() \
export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
/bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \
/bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
%{nil}
+%systemd_service_reload() \
+ export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+ /bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \
+%{nil}
+
%systemd_trigger() \
want_enable_service() { \
[ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \