From 0b9095c11baaa6fc6bf0851290280f9cba67f5be Mon Sep 17 00:00:00 2001 From: Bhupesh Sharma Date: Thu, 26 Jul 2018 16:03:33 +0530 Subject: [PATCH] Remove obsolete kdump tool Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1441677 Testing: On x86_64 Fedora machine. After this patch kdump utility and related man page cannot be found on this machine: [root@tyan-gt24-09 ~]# which kdump /usr/bin/which: no kdump in (/usr/lib64/qt-3.3/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin) [root@tyan-gt24-09 ~]# man kdump No manual entry for kdump Update the fedora 'kexec-tools.spec' to not install the obsolete kdump tool. I have submitted an upstream patch to obsolete the kdump tool from upstream kexec-tools (which has been accepted), but after an internal discussion we decided not to backport the upstream 'kexec-tools' patch (which does the same) for fedora, as we would prefer to manage the changes directly in the .spec file itself. Signed-off-by: Bhupesh Sharma --- kexec-tools.spec | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/kexec-tools.spec b/kexec-tools.spec index fb09c9e..9468ab1 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -146,7 +146,7 @@ make -C makedumpfile-1.6.4 LDFLAGS="-I../eppic/libeppic -L../eppic/libeppic" epp make -C kdump-anaconda-addon/po %install -make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p -m755 $RPM_BUILD_ROOT/sbin mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p -m755 $RPM_BUILD_ROOT%{_localstatedir}/crash mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/man8/ @@ -160,6 +160,11 @@ mkdir -p -m755 $RPM_BUILD_ROOT%{_libdir} mkdir -p -m755 $RPM_BUILD_ROOT%{_prefix}/lib/kdump install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/kdumpctl +install -m 755 build/sbin/kexec $RPM_BUILD_ROOT/sbin/kexec +install -m 755 build/sbin/vmcore-dmesg $RPM_BUILD_ROOT/sbin/vmcore-dmesg +install -m 644 build/man/man8/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install -m 644 build/man/man8/vmcore-dmesg.8 $RPM_BUILD_ROOT%{_mandir}/man8/ + SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu} [ -f $SYSCONFIG ] || SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig.%{_arch} [ -f $SYSCONFIG ] || SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig @@ -289,7 +294,10 @@ do done %files -/sbin/* +/sbin/kexec +/sbin/makedumpfile +/sbin/mkdumprd +/sbin/vmcore-dmesg %{_bindir}/* %{_datadir}/kdump %{_prefix}/lib/kdump @@ -303,7 +311,11 @@ done %endif %{dracutlibdir}/modules.d/* %dir %{_localstatedir}/crash -%{_mandir}/man8/* +%{_mandir}/man8/kdumpctl.8.gz +%{_mandir}/man8/kexec.8.gz +%{_mandir}/man8/makedumpfile.8.gz +%{_mandir}/man8/mkdumprd.8.gz +%{_mandir}/man8/vmcore-dmesg.8.gz %{_mandir}/man5/* %{_unitdir}/kdump.service %{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh