From 61137b101bb903ccbe330ef6dcea2eaeef6c25ca Mon Sep 17 00:00:00 2001 From: Lichen Liu Date: Mon, 29 Apr 2024 10:05:54 +0800 Subject: [PATCH] makedumpfile: re-use source Makefile's install logic Resolves: RHEL-29044 Upstream: Fedora Conflict: None commit f7bd239656269ea777454fe6c541aa0decaa4545 Author: Coiby Xu Date: Tue Apr 9 07:26:13 2024 +0800 makedumpfile: re-use source Makefile's install logic Signed-off-by: Coiby Xu Reviewed-by: Philipp Rudo Reviewed-by: Dave Young Signed-off-by: Lichen Liu --- kexec-tools.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/kexec-tools.spec b/kexec-tools.spec index 528da85..a033217 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -279,14 +279,12 @@ install -m 755 %{SOURCE201} %{buildroot}/%{dracutdir}/99zz-fadumpinit/module-set %endif # makedumpfile -install -m 755 makedumpfile-%{mkdf_ver}/makedumpfile $RPM_BUILD_ROOT/usr/sbin/makedumpfile -install -m 644 makedumpfile-%{mkdf_ver}/makedumpfile.8 $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8 -install -m 644 makedumpfile-%{mkdf_ver}/makedumpfile.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5 -install -m 644 makedumpfile-%{mkdf_ver}/makedumpfile.conf $RPM_BUILD_ROOT/%{_sysconfdir}/makedumpfile.conf.sample -install -m 755 -D makedumpfile-%{mkdf_ver}/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdir}/eppic_makedumpfile.so -mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/ -install -m 644 makedumpfile-%{mkdf_ver}/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/ +make DESTDIR=%{buildroot} -C makedumpfile-%{mkdf_ver} install +install -m 644 -D makedumpfile-%{mkdf_ver}/makedumpfile.conf %{buildroot}/%{_sysconfdir}/makedumpfile.conf.sample +rm %{buildroot}/%{_sbindir}/makedumpfile-R.pl + +install -m 755 -D makedumpfile-%{mkdf_ver}/eppic_makedumpfile.so %{buildroot}/%{_libdir}/eppic_makedumpfile.so %post -n kdump-utils # don't try to systemctl preset the kdump service for old kexec-tools @@ -389,8 +387,8 @@ fi %files -n makedumpfile %license makedumpfile-%{mkdf_ver}/COPYING %{_sbindir}/makedumpfile -%{_mandir}/man5/makedumpfile.conf.5.gz -%{_mandir}/man8/makedumpfile.8.gz +%{_mandir}/man5/makedumpfile.conf.5.* +%{_mandir}/man8/makedumpfile.8.* %{_sysconfdir}/makedumpfile.conf.sample %{_libdir}/eppic_makedumpfile.so %{_datadir}/makedumpfile/