diff --git a/98-kexec.rules.ppc64 b/98-kexec.rules.ppc64 deleted file mode 100644 index 1a9122094544f8c51085cd7e708d4b62a1051715..0000000000000000000000000000000000000000 --- a/98-kexec.rules.ppc64 +++ /dev/null @@ -1,15 +0,0 @@ -SUBSYSTEM=="cpu", ACTION=="online", GOTO="kdump_reload" -SUBSYSTEM=="memory", ACTION=="online", GOTO="kdump_reload" -SUBSYSTEM=="memory", ACTION=="offline", GOTO="kdump_reload" - -GOTO="kdump_reload_end" - -LABEL="kdump_reload" - -# If kdump is not loaded, calling kdump-udev-throttle will end up -# doing nothing, but systemd-run will always generate extra logs for -# each call, so trigger the kdump-udev-throttler only if kdump -# service is active to avoid unnecessary logs -RUN+="/bin/sh -c '/usr/bin/systemctl is-active kdump.service || exit 0; /usr/bin/systemd-run --quiet --no-block /usr/lib/udev/kdump-udev-throttler'" - -LABEL="kdump_reload_end" diff --git a/kexec-tools.spec b/kexec-tools.spec index 179f8b595211c881b4a9289e9481c48938d25268..ce58e0fa7a5b028776a004bcf9792fa6065dc259 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -4,7 +4,7 @@ Name: kexec-tools Version: 2.0.23 -Release: 4 +Release: 5 License: GPLv2 Summary: The kexec/kdump userspace component URL: https://www.kernel.org/ @@ -19,7 +19,6 @@ Source8: kdump.conf Source9: https://github.com/makedumpfile/makedumpfile/releases/download/%{mkdf_ver}/makedumpfile-%{mkdf_ver}.tar.gz Source12: mkdumprd.8 Source13: 98-kexec.rules -Source14: 98-kexec.rules.ppc64 Source15: kdump.conf.5 Source16: kdump.service Source18: kdump.sysconfig.s390x @@ -158,7 +157,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_mandir}/man5/kdump.conf.5 install -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/kdump.service install -m 755 -D %{SOURCE22} %{buildroot}%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh install -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_udevrulesdir}/98-kexec.rules -install -m 644 %{SOURCE14} %{buildroot}%{_udevrulesdir}/98-kexec.rules %ifarch %{ix86} x86_64 aarch64 install -m 755 makedumpfile-%{mkdf_ver}/makedumpfile $RPM_BUILD_ROOT/usr/sbin/makedumpfile @@ -290,6 +288,9 @@ done %endif %changelog +* Fri Mar 11 2022 wangbin - 2.0.23-5 +- packing 98-kexec.rules instead of 98-kexec.rules.ppc64 + * Wed Feb 23 2022 wangbin - 2.0.23-4 - arm64/crashdump: deduce paddr of _text based on kernel code size