On Tuesday 25 October 2016 01:15 PM, Baoquan He wrote:
On 10/25/16 at 02:50pm, Pingfan Liu wrote:
> From: Pingfan Liu <piliu(a)redhat.com>
>
> Fix Bug 925630 - kexec-tools: support for arm64
>
https://bugzilla.redhat.com/show_bug.cgi?id=925630
>
> Support for the ARM 64 bit CPU architecture (aarch64) was introduced in
> autoconf 2.69. kexec-tools appears to use an earlier version of
> autoconf, preventing its being built. This series fix this issue by
> updates config.guess and config.sub to recognize aarch64
Don't understand what you are trying to do. What I got is you are back
porting aarch64 supporting code to f25, meanwhile you found it still
doesn't work because kexec-tools is still using old autoconf. So you fix
it too in this patch. Right?
Yes,commit log need to be improved.
>
> patchset backported from upstream:
> commit abdfe97736f89d9bc73662b9134604b0229a599e
> commit 522df5f7217fda01ece3f6ac3e9987b0320c2bb0
> commit 217bcc00c9309416a6c6cd0584196559d28a9259
>
> Signed-off-by: Pingfan Liu <piliu(a)redhat.com>
> ---
[...]
> +
> diff --git a/kexec-tools.spec b/kexec-tools.spec
> index cd26ec3..985fd2d 100644
> --- a/kexec-tools.spec
> +++ b/kexec-tools.spec
> @@ -1,9 +1,10 @@
> Name: kexec-tools
> Version: 2.0.13
> -Release: 5%{?dist}
> +Release: 6%{?dist}
> License: GPLv2
> Group: Applications/System
> Summary: The kexec/kdump userspace component
> +
> Source0:
http://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
> Source1: kdumpctl
> Source2: kdump.sysconfig
> @@ -50,14 +51,13 @@ Requires: dracut-network, ethtool
> BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel
bzip2-devel ncurses-devel bison flex lzo-devel snappy-devel
> BuildRequires: pkgconfig intltool gettext
> BuildRequires: systemd-units
> +BuildRequires: automake autoconf libtool
> %ifarch %{ix86} x86_64 ppc64 ppc s390x ppc64le
> Obsoletes: diskdumputils netdump kexec-tools-eppic
> %endif
>
> %undefine _hardened_build
>
> -ExcludeArch: aarch64
> -
> #START INSERT
>
> #
> @@ -76,8 +76,12 @@ ExcludeArch: aarch64
> # Patches 401 through 500 are meant for s390 kexec-tools enablement
> #
> #
> -# Patches 501 through 600 are meant for ppc kexec-tools enablement
> +# Patches 501 through 600 are meant for ARM kexec-tools enablement
I think, we should not change ppc space. We should keep aarch64 patches
from 601 to 700. Generic patches can be moved after 700.
> #
> +# kexec v5 -
http://lists.infradead.org/pipermail/kexec/2016-September/017110.html
> +Patch500: 0001-kexec-Add-common-device-tree-routines.patch
> +Patch501: 0002-arm64-Add-arm64-kexec-support.patch
> +Patch502: 0003-arm64-Add-support-for-binary-image-files.patch
Just to keep in sync with other similar modifications: we should rename
above patches as kexec-tools-2.0.13-.....
>
> #
> # Patches 601 onward are generic patches
> @@ -107,6 +111,9 @@ tar -z -x -v -f %{SOURCE9}
> tar -z -x -v -f %{SOURCE19}
> tar -z -x -v -f %{SOURCE23}
>
> +%patch500 -p1
> +%patch501 -p1
> +%patch502 -p1
>
> %patch601 -p1
> %patch602 -p1
> @@ -117,7 +124,7 @@ tar -z -x -v -f %{SOURCE23}
> %endif
>
> %build
> -
> +autoreconf
> %configure \
> %ifarch ppc64
> --host=powerpc64-redhat-linux-gnu \
> @@ -315,6 +322,9 @@ done
> %doc
>
> %changelog
> +* Mon Sep 19 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> 2.0.13-6
> +- Add initial upstream support for kexec on aarch64
> +
> * Fri Sep 16 2016 Dave Young <dyoung(a)redhat.com> - 2.0.13-5
> - Fix bug 1373958 for system boot without initrd
> - Do not depend on /etc/fstab in kdumpctl in case it does not exist
> --
> 2.9.3
>
Other than above comments, patches looks fine to me, as they are exactly
what we have in upstream.
I will test these patches latest fedora kernel,and will let you know.
~Pratyush