Re: [PATCH 3/3] Modify the kexec-tools.spec file to generate a kdump-anaconda-addon subpackage

[Dave Young]

On 05/09/14 at 10:50am, Arthur Zou wrote:
> Signed-off-by: Arthur Zou
>
> kexec-tools.spec | 28 ++++++++++++++++++++++++++--
>  1 file changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/kexec-tools.spec b/kexec-tools.spec
> index c738162..edc51a4 100644
> --- a/kexec-tools.spec
> +++ b/kexec-tools.spec
> @@ -26,6 +26,7 @@ Source18: kdump.sysconfig.s390x
>  Source19: eppic_030413.tar.gz
>  Source20: kdump-lib.sh
>  Source21: kdump-in-cluster-environment.txt
> +Source22: kdump-anaconda-addon-0.1.tar.gz

There's below file in lastest repo, please rebase to latest git.
Source22: kdump-dep-generator.sh
> #######################################
>  # These are sources for mkdumpramfs
> @@ -43,6 +44,12 @@ Requires: dracut, 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:  gettext

There's already gettext, see the first line BuildRequires.
> +BuildRequires:  python2-devel
> +BuildRequires:  python-cpio

Can you double check if we really need above two? Since original firstboot does not..
> +BuildRequires:  anaconda >= 19
> +Requires:       anaconda >= 19
> +Requires:       python-cpio

Please also double check them, also check the version. I remember the translation for
glade file only works with recent anaconda version >= 21.33..
> %ifarch %{ix86} x86_64 ppc64 ia64 ppc s390x
>  Obsoletes: diskdumputils netdump
>  %endif
> @@ -118,13 +125,22 @@ The eppic_makedumpfile.so shared object is loaded by the
>  or confidential kernel data from a dumpfile.
>  %endif
>
> +%package -n kdump-anaconda-addon
> +Version:        0.1
> +Release:        1%{?dist}
> +Summary:        Kdump configration anaconda addon
> +License:        GPLv2+
> +URL:            [e-mail]:daveyoung/kdump-anaconda-addon.git

Since we are maintaining them in kexec-tools repo, these URL,License probably
can be dropped or use Fedora address.
> +%description -n kdump-anaconda-addon
> +Kdump anaconda addon
>
> %prep
>  %setup -q
>
> mkdir -p -m755 kcp
>  tar -z -x -v -f %{SOURCE9}
>  tar -z -x -v -f %{SOURCE19}
>
> +tar -z -x -v -f %{SOURCE22}
>
> %patch101 -p1
>  %patch301 -p1
> @@ -150,6 +166,7 @@ tar -z -x -v -f %{SOURCE19}
>  %patch619 -p1
>
> tar -z -x -v -f %{SOURCE13}
> +tar -z -x -v -f %{SOURCE22}
>
> %ifarch ppc
>  %define archdef ARCH=ppc
> @@ -182,6 +199,7 @@ make -C eppic/libeppic
>  make -C makedumpfile-1.5.4 LINKTYPE=dynamic USELZO=on USESNAPPY=on
>  %endif
>  make -C kexec-tools-po
> +make -C kdump-anaconda-addon-0.1/po
>
> %install
>  make install DESTDIR=$RPM_BUILD_ROOT
> @@ -228,6 +246,8 @@ install -m 755 makedumpfile-1.5.4/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdi
>  %endif
>  make -C kexec-tools-po install DESTDIR=$RPM_BUILD_ROOT
>  %find_lang %{name}
> +make -C kdump-anaconda-addon-0.1 install DESTDIR=$RPM_BUILD_ROOT
> +%find_lang kdump-anaconda-addon
>
> %define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g')
>
> @@ -336,7 +356,7 @@ do
>    fi
>  done
>
> -%files -f %{name}.lang
> +%files -f %{name}.lang 
>  /sbin/*
>  /usr/sbin/*
>  %{_bindir}/*
> @@ -366,6 +386,10 @@ done
>  %{_libdir}/eppic_makedumpfile.so
>  %endif
>
> +%files -n kdump-anaconda-addon -f kdump-anaconda-addon.lang 
> +%{_datadir}/anaconda/addons/com_redhat_kdump
> +%doc
>
> %changelog
> Thu Apr 03 2014 WANG Chao  - 2.0.4-27
> Add fence_kdump support for generic clusters
>
> -- 
> 1.8.4.2