Try to adjust for riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
b41cab7099
commit
11fbe53d9b
|
@ -211,6 +211,8 @@ update_param()
|
|||
case "$1" in
|
||||
aarch64) ;;
|
||||
|
||||
riscv64) ;;
|
||||
|
||||
i386) ;;
|
||||
|
||||
ppc64) ;;
|
||||
|
|
|
@ -76,6 +76,11 @@ aarch64)
|
|||
update_param KDUMP_COMMANDLINE_APPEND \
|
||||
"irqpoll nr_cpus=1 reset_devices cgroup_disable=memory udev.children-max=2 panic=10 swiotlb=noforce novmcoredd cma=0 hugetlb_cma=0"
|
||||
;;
|
||||
riscv64)
|
||||
update_param KEXEC_ARGS "-s"
|
||||
update_param KDUMP_COMMANDLINE_APPEND \
|
||||
"irqpoll nr_cpus=1 reset_devices cgroup_disable=memory udev.children-max=2 panic=10 swiotlb=noforce novmcoredd cma=0 hugetlb_cma=0"
|
||||
;;
|
||||
i386)
|
||||
update_param KDUMP_COMMANDLINE_APPEND \
|
||||
"irqpoll nr_cpus=1 reset_devices numa=off udev.children-max=2 panic=10 transparent_hugepage=never novmcoredd cma=0 hugetlb_cma=0"
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
Name: kexec-tools
|
||||
Version: 2.0.26
|
||||
Release: 3%{?dist}
|
||||
Release: 3.0.riscv64%{?dist}
|
||||
License: GPLv2
|
||||
Summary: The kexec/kdump userspace component
|
||||
|
||||
|
@ -127,6 +127,11 @@ tar -z -x -v -f %{SOURCE19}
|
|||
%define archdef ARCH=ppc
|
||||
%endif
|
||||
|
||||
%ifarch riscv64
|
||||
find . -name 'config.sub' -exec cp -vf /usr/lib/rpm/%{?_vendor}/config.sub {} \;
|
||||
find . -name 'config.guess' -exec cp -vf /usr/lib/rpm/%{?_vendor}/config.guess {} \;
|
||||
%endif
|
||||
|
||||
%build
|
||||
autoreconf
|
||||
%configure \
|
||||
|
@ -153,7 +158,7 @@ cp %{SOURCE34} .
|
|||
%{SOURCE4} %{_target_cpu} > kdump.conf
|
||||
|
||||
make
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 riscv64
|
||||
make -C eppic-%{eppic_ver}/libeppic
|
||||
make -C makedumpfile-%{mkdf_ver} LINKTYPE=dynamic USELZO=on USESNAPPY=on USEZSTD=on
|
||||
make -C makedumpfile-%{mkdf_ver} LDFLAGS="$LDFLAGS -I../eppic-%{eppic_ver}/libeppic -L../eppic-%{eppic_ver}/libeppic" eppic_makedumpfile.so
|
||||
|
@ -215,7 +220,7 @@ install -m 755 -D %{SOURCE22} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-gener
|
|||
install -m 755 -D %{SOURCE30} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/60-kdump.install
|
||||
install -m 755 -D %{SOURCE33} $RPM_BUILD_ROOT%{_prefix}/lib/kernel/install.d/92-crashkernel.install
|
||||
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 riscv64
|
||||
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
|
||||
|
@ -285,8 +290,8 @@ servicelog_notify --add --command=/usr/lib/kdump/kdump-migrate-action.sh --match
|
|||
%endif
|
||||
|
||||
# This portion of the script is temporary. Its only here
|
||||
# to fix up broken boxes that require special settings
|
||||
# in /etc/sysconfig/kdump. It will be removed when
|
||||
# to fix up broken boxes that require special settings
|
||||
# in /etc/sysconfig/kdump. It will be removed when
|
||||
# These systems are fixed.
|
||||
|
||||
if [ -d /proc/bus/mckinley ]
|
||||
|
@ -299,7 +304,7 @@ then
|
|||
elif [ -d /proc/sgi_sn ]
|
||||
then
|
||||
# This is for SGI SN boxes
|
||||
# They require the --noio option to kexec
|
||||
# They require the --noio option to kexec
|
||||
# since they don't support legacy io
|
||||
sed -e's/\(^KEXEC_ARGS.*\)\("$\)/\1 --noio"/' \
|
||||
/etc/sysconfig/kdump > /etc/sysconfig/kdump.new
|
||||
|
@ -360,7 +365,7 @@ fi
|
|||
|
||||
%files
|
||||
/usr/sbin/kexec
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 riscv64
|
||||
/usr/sbin/makedumpfile
|
||||
%endif
|
||||
%ifarch ppc64 ppc64le
|
||||
|
@ -372,7 +377,7 @@ fi
|
|||
%{_bindir}/*
|
||||
%{_datadir}/kdump
|
||||
%{_prefix}/lib/kdump
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 riscv64
|
||||
%{_sysconfdir}/makedumpfile.conf.sample
|
||||
%endif
|
||||
%config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump
|
||||
|
@ -389,7 +394,7 @@ fi
|
|||
%dir %{_sharedstatedir}/kdump
|
||||
%{_mandir}/man8/kdumpctl.8.gz
|
||||
%{_mandir}/man8/kexec.8.gz
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 riscv64
|
||||
%{_mandir}/man8/makedumpfile.8.gz
|
||||
%endif
|
||||
%{_mandir}/man8/mkdumprd.8.gz
|
||||
|
@ -408,12 +413,15 @@ fi
|
|||
%doc kdump-in-cluster-environment.txt
|
||||
%doc live-image-kdump-howto.txt
|
||||
%doc crashkernel-howto.txt
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
|
||||
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 riscv64
|
||||
%{_libdir}/eppic_makedumpfile.so
|
||||
/usr/share/makedumpfile/
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Aug 30 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2.0.26-3.0.riscv64
|
||||
- Enable riscv64
|
||||
|
||||
* Jan 30 2023 Coiby <coxu@redhat.com> - 2.0.26-3
|
||||
- kdumpctl: make do_estimate more robust
|
||||
- kdumpctl: refractor check_rebuild
|
||||
|
@ -1120,7 +1128,7 @@ fi
|
|||
- Revert "dracut-module-setup.sh: pass correct ip= param for ipv6"
|
||||
|
||||
* Sat Apr 28 2018 Dave Young <dyoung@redhat.com> - 2.0.17-2
|
||||
- pull in makedumpfile 1.6.3
|
||||
- pull in makedumpfile 1.6.3
|
||||
|
||||
* Sat Apr 28 2018 Dave Young <dyoung@redhat.com> - 2.0.17-1
|
||||
- pull in 2.0.17
|
||||
|
@ -1180,10 +1188,10 @@ fi
|
|||
* Tue Aug 8 2017 Dave Young <dyoung@redhat.com> - 2.0.15-10
|
||||
- Improve 'cpu add' udev rules
|
||||
- module-setup: suppress the early iscsi error messages
|
||||
- mkdumprd: use 300s as the default systemd unit timeout for kdump mount
|
||||
- mkdumprd: use 300s as the default systemd unit timeout for kdump mount
|
||||
|
||||
* Mon Aug 7 2017 Dave Young <dyoung@redhat.com> - 2.0.15-9
|
||||
- fix makedumpfile bug 1474706
|
||||
- fix makedumpfile bug 1474706
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.15-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
@ -1339,9 +1347,9 @@ fi
|
|||
- module-setup: Use get_ifcfg_filename() to get the proper ifcfg file
|
||||
|
||||
* Mon May 30 2016 Dave Young <dyoung@redhat.com> - 2.0.12-4
|
||||
- update kdump anaconda addon to add mem range in tui
|
||||
- update kdump anaconda addon to add mem range in tui
|
||||
- .gitignore: Update to make it more generic
|
||||
- kdumpctl: check_rebuild improvement
|
||||
- kdumpctl: check_rebuild improvement
|
||||
- kdumpctl: Do not rebuild initramfs when $KDUMP_BOOTDIR is read only
|
||||
|
||||
* Tue Mar 29 2016 Dave Young <dyoung@redhat.com> - 2.0.12-3
|
||||
|
@ -1352,7 +1360,7 @@ fi
|
|||
- ppc64le: fix kexec hang due to ppc64 elf abi breakage
|
||||
|
||||
* Tue Mar 22 2016 Dave Young <dyoung@redhat.com> - 2.0.12-1
|
||||
- Rebase kexec-tools to 2.0.12
|
||||
- Rebase kexec-tools to 2.0.12
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
@ -1365,7 +1373,7 @@ fi
|
|||
- fix bogus date in changelog
|
||||
|
||||
* Thu Nov 19 2015 Dave Young <dyoung@redhat.com> - 2.0.11-2
|
||||
- Rebase to upstream makedumpfile 1.5.9
|
||||
- Rebase to upstream makedumpfile 1.5.9
|
||||
|
||||
* Mon Nov 9 2015 Dave Young <dyoung@redhat.com> - 2.0.11-1
|
||||
- Rebase to upstream kexec-tools 2.0.11
|
||||
|
@ -1375,7 +1383,7 @@ fi
|
|||
- Remove duplicate prefix path ${initdir}
|
||||
|
||||
* Tue Sep 8 2015 Dave Young <dyoung@redhat.com> - 2.0.10-8
|
||||
- update kdump addon to fix a kickstart installationi issue
|
||||
- update kdump addon to fix a kickstart installationi issue
|
||||
|
||||
* Wed Aug 19 2015 Dave Young <dyoung@redhat.com> - 2.0.10-7
|
||||
- add man page for kdumpctl
|
||||
|
@ -1717,7 +1725,7 @@ fi
|
|||
|
||||
* Thu Mar 14 2013 Baoquan He <bhe@redhat.com> - 2.0.3-69
|
||||
- Support for eppic language as a subpackage
|
||||
|
||||
|
||||
* Thu Mar 14 2013 Baoquan He <bhe@redhat.com> - 2.0.3-68
|
||||
- tune sysconfig to save memory usage
|
||||
- Remove useless codes related to LOGGER in kdumpctl
|
||||
|
@ -1844,7 +1852,7 @@ fi
|
|||
- do not add fstab-sys module in dracut cmdline
|
||||
- omit dash module
|
||||
- network dns config fix
|
||||
- shell exit value fix
|
||||
- shell exit value fix
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-52
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
@ -2171,7 +2179,7 @@ fi
|
|||
- Make makedumpfile a dynamic binary
|
||||
|
||||
* Mon Jul 06 2009 Neil Horman <nhorman@redhat.com> 2.0.0-19
|
||||
- Fix build issue
|
||||
- Fix build issue
|
||||
|
||||
* Mon Jul 06 2009 Neil Horman <nhorman@redhat.com> 2.0.0-18
|
||||
- Updated initscript to use mkdumprd2 if manifest is present
|
||||
|
@ -2383,7 +2391,7 @@ fi
|
|||
- updating mkdumprd to use new kcp syntax
|
||||
|
||||
* Wed Aug 23 2006 Neil Horman <nhorman@redhat.com> - 1.101-48
|
||||
- Bumping revision number
|
||||
- Bumping revision number
|
||||
|
||||
* Tue Aug 22 2006 Jarod Wilson <jwilson@redhat.com> - 1.101-47
|
||||
- ppc64 no-more-platform fix
|
||||
|
@ -2403,7 +2411,7 @@ fi
|
|||
|
||||
* Tue Aug 15 2006 Neil Horman <nhorman@redhat.com> - 1.101-44
|
||||
- updated init script to implement status function/scrub err messages
|
||||
|
||||
|
||||
* Wed Aug 09 2006 Jarod Wilson <jwilson@redhat.com> - 1.101-43
|
||||
- Misc spec cleanups and macro-ifications
|
||||
|
||||
|
@ -2411,13 +2419,13 @@ fi
|
|||
- Add %%dir /var/crash, so default kdump setup works
|
||||
|
||||
* Thu Aug 03 2006 Neil Horman <nhorman@redhat.com> - 1.101-41
|
||||
- fix another silly makefile error for makedumpfile
|
||||
- fix another silly makefile error for makedumpfile
|
||||
|
||||
* Thu Aug 03 2006 Neil Horman <nhorman@redhat.com> - 1.101-40
|
||||
- exclude makedumpfile from build on non-x86[_64] arches
|
||||
- exclude makedumpfile from build on non-x86[_64] arches
|
||||
|
||||
* Thu Aug 03 2006 Neil Horman <nhorman@redhat.com> - 1.101-39
|
||||
- exclude makedumpfile from build on non-x86[_64] arches
|
||||
- exclude makedumpfile from build on non-x86[_64] arches
|
||||
|
||||
* Thu Aug 03 2006 Neil Horman <nhorman@redhat.com> - 1.101-38
|
||||
- updating makedumpfile makefile to use pkg-config on glib-2.0
|
||||
|
@ -2514,7 +2522,7 @@ fi
|
|||
|
||||
* Wed Nov 16 2005 Thomas Graf <tgraf@redhat.com> - 1.101-5
|
||||
- Report missing kdump kernel image as warning
|
||||
|
||||
|
||||
* Thu Nov 3 2005 Jeff Moyer <jmoyer@redhat.com> - 1.101-4
|
||||
- Build for x86_64 as well. Kdump support doesn't work there, but users
|
||||
should be able to use kexec.
|
||||
|
|
Loading…
Reference in New Issue