Remove kexec-tools-eppic subpackage

Remove this package and put eppic_makedumpfile.so and its sample
scripts in kexec-tools package.

makedumpfile does dlopen() on eppic_makedumpfile.so and that does not
enforce any choice. One could either ship it in kexec-tools package or
in a subpackage. Both will work.

The real reason was that code for eppic_makedumpfile.so
(extension_eppic.c) and some eppic scripts are in upstream makedumpfile
project. And that project is distributed as part of kexec-tools package.

Now breaking down that makedumpfile in two parts and shipping all
eppic specific bits in a separate subpackage was creating confusion
everytime we did some changes.

So to avoid that confusion and to keep all of the makedumpfile related
bits in a single package, this change is being done.

Signed-off-by: WANG Chao <chaowang@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
WANG Chao 2014-10-14 13:11:23 +08:00
parent b29d8e0d54
commit 5379422cd4

View File

@ -48,7 +48,7 @@ BuildRequires: zlib-devel zlib zlib-static elfutils-devel-static glib2-devel bzi
BuildRequires: pkgconfig intltool gettext BuildRequires: pkgconfig intltool gettext
BuildRequires: systemd-units BuildRequires: systemd-units
%ifarch %{ix86} x86_64 ppc64 ppc s390x ppc64le %ifarch %{ix86} x86_64 ppc64 ppc s390x ppc64le
Obsoletes: diskdumputils netdump Obsoletes: diskdumputils netdump kexec-tools-eppic
%endif %endif
ExcludeArch: aarch64 ExcludeArch: aarch64
@ -90,18 +90,6 @@ normal or a panic reboot. This package contains the /sbin/kexec
binary and ancillary utilities that together form the userspace binary and ancillary utilities that together form the userspace
component of the kernel's kexec feature. component of the kernel's kexec feature.
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le
%package eppic
Requires: %{name} = %{version}-%{release}
Summary: Additional eppic_makedumpfile.so shared object
Group: Applications/System
%description eppic
The eppic_makedumpfile.so shared object is loaded by the
"makedumpfile --eppic" option, and is used to erase sensitive
or confidential kernel data from a dumpfile.
%endif
%package anaconda-addon %package anaconda-addon
Summary: Kdump configuration anaconda addon Summary: Kdump configuration anaconda addon
Requires: anaconda >= 21.33 Requires: anaconda >= 21.33
@ -314,12 +302,8 @@ done
%doc TODO %doc TODO
%doc kexec-kdump-howto.txt %doc kexec-kdump-howto.txt
%doc kdump-in-cluster-environment.txt %doc kdump-in-cluster-environment.txt
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le
%files eppic
%{_libdir}/eppic_makedumpfile.so %{_libdir}/eppic_makedumpfile.so
/usr/share/makedumpfile/eppic_scripts/ /usr/share/makedumpfile/eppic_scripts/
%endif
%files anaconda-addon -f kdump-anaconda-addon.lang %files anaconda-addon -f kdump-anaconda-addon.lang
%{_datadir}/anaconda/addons/com_redhat_kdump %{_datadir}/anaconda/addons/com_redhat_kdump