Patch merged, thanks to Kairui and Philipp!
On Wed, Jan 19, 2022 at 08:15:25PM +0100, Philipp Rudo wrote:
Hi Kairui,
On Sun, 9 Jan 2022 18:03:35 +0800
Kairui Song <ryncsn(a)gmail.com> wrote:
> From: Kairui Song <kasong(a)tencent.com>
>
> fadump is a ppc only feature, mkfadumprd is only needed for fadump, drop
> it for other arch.
FYI, i'm planing to transform mkdumprd and mkfadumprd to util library
and merge them into one file in near future. So this patch won't be
long living. But in the meantime it totally makes sense.
Reviewed-by: Philipp Rudo <prudo(a)redhat.com>
> Signed-off-by: Kairui Song <kasong(a)tencent.com>
> ---
> kexec-tools.spec | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/kexec-tools.spec b/kexec-tools.spec
> index dffcce0..566a257 100644
> --- a/kexec-tools.spec
> +++ b/kexec-tools.spec
> @@ -187,7 +187,6 @@ SYSCONFIG=$RPM_SOURCE_DIR/kdump.sysconfig.%{_target_cpu}
> install -m 644 $SYSCONFIG $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/kdump
>
> install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/usr/sbin/mkdumprd
> -install -m 755 %{SOURCE32} $RPM_BUILD_ROOT/usr/sbin/mkfadumprd
> install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
> install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
> install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8
> @@ -196,6 +195,7 @@ install -m 755 %{SOURCE20}
$RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib.sh
> install -m 755 %{SOURCE23}
$RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib-initramfs.sh
> install -m 755 %{SOURCE31} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-logger.sh
> %ifarch ppc64 ppc64le
> +install -m 755 %{SOURCE32} $RPM_BUILD_ROOT/usr/sbin/mkfadumprd
> install -m 755 %{SOURCE35}
$RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-migrate-action.sh
> install -m 755 %{SOURCE36} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-restart.sh
> %endif
> @@ -351,8 +351,10 @@ done
> %ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
> /usr/sbin/makedumpfile
> %endif
> -/usr/sbin/mkdumprd
> +%ifarch ppc64 ppc64le
> /usr/sbin/mkfadumprd
> +%endif
> +/usr/sbin/mkdumprd
> /usr/sbin/vmcore-dmesg
> %{_bindir}/*
> %{_datadir}/kdump
_______________________________________________
kexec mailing list -- kexec(a)lists.fedoraproject.org
To unsubscribe send an email to kexec-leave(a)lists.fedoraproject.org
Fedora Code of Conduct:
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines:
https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives:
https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure