From 36dc2b977e19fae268e773b720834fc83f91f8d1 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: May 20 2019 16:23:08 +0000 Subject: Fix FTBFS on armhfp --- diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec index 283c286..8a6bafb 100644 --- a/SPECS/kexec-tools.spec +++ b/SPECS/kexec-tools.spec @@ -60,7 +60,7 @@ BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel bzi BuildRequires: pkgconfig intltool gettext BuildRequires: systemd-units BuildRequires: automake autoconf libtool -%ifarch %{ix86} x86_64 ppc64 ppc s390x ppc64le +%ifarch %{ix86} x86_64 ppc64 ppc s390x ppc64le %{arm} Obsoletes: diskdumputils netdump kexec-tools-eppic %endif @@ -167,7 +167,7 @@ cp %{SOURCE27} . cp %{SOURCE28} . make -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 +%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 %{arm} make -C eppic/libeppic make -C makedumpfile-1.6.4 LINKTYPE=dynamic USELZO=on USESNAPPY=on make -C makedumpfile-1.6.4 LDFLAGS="-I../eppic/libeppic -L../eppic/libeppic" eppic_makedumpfile.so @@ -215,7 +215,7 @@ install -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{_mandir}/man5/kdump.conf.5 install -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{_unitdir}/kdump.service install -m 755 -D %{SOURCE22} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-generators/kdump-dep-generator.sh -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 +%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 %{arm} install -m 755 makedumpfile-1.6.4/makedumpfile $RPM_BUILD_ROOT/sbin/makedumpfile install -m 644 makedumpfile-1.6.4/makedumpfile.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8/makedumpfile.8.gz install -m 644 makedumpfile-1.6.4/makedumpfile.conf.5.gz $RPM_BUILD_ROOT/%{_mandir}/man5/makedumpfile.conf.5.gz @@ -328,7 +328,7 @@ done %{_bindir}/* %{_datadir}/kdump %{_prefix}/lib/kdump -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 +%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 %{arm} %{_sysconfdir}/makedumpfile.conf.sample %endif %config(noreplace,missingok) %{_sysconfdir}/sysconfig/kdump @@ -355,12 +355,15 @@ done %doc supported-kdump-targets.txt %doc kdump-in-cluster-environment.txt %doc live-image-kdump-howto.txt -%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 +%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64 %{arm} %{_libdir}/eppic_makedumpfile.so /usr/share/makedumpfile/ %endif %changelog +* Mon May 20 2019 Pablo Greco - 2.0.17-28 +- Fix FTBFS on armhfp + * Fri Feb 22 2019 Pingfan Liu - 2.0.17-28 - makedumpfile/arm64: Add support for ARMv8.2-LVA (52-bit user-space VA support)