!43 修改spec文件打包正确的udev规则文件

From: @wangbin224 
Reviewed-by: @hanxinke 
Signed-off-by: @hanxinke
This commit is contained in:
openeuler-ci-bot 2022-03-11 02:45:00 +00:00 committed by Gitee
commit e0174464c6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 18 deletions

View File

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

View File

@ -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 <wangbin224@huawei.com> - 2.0.23-5
- packing 98-kexec.rules instead of 98-kexec.rules.ppc64
* Wed Feb 23 2022 wangbin <wangbin224@huawei.com> - 2.0.23-4
- arm64/crashdump: deduce paddr of _text based on kernel code size