rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove kdump-anaconda subpackage

Browse Source 
Kdump anaconda has been included as a subpackage for a long time, which
is not a good practice, as the anaconda plugin should be built as
noarch and it does not belong to kexec-tools. We have created a new
package 'kdump-anaconda-addon', so remove it here.

The release version should be bumped later so that kdump-anaconda-addon
could mark previous versions as obsoleted.

Signed-off-by: Kairui Song <kasong@redhat.com>
This commit is contained in:
Kairui Song 2018-08-07 13:12:12 +08:00
parent 3b8642c280
commit 25b19d3627
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kexec-tools.spec
View File

@ -24,12 +24,11 @@ Source19: eppic_050615.tar.gz
Source20: kdump-lib.sh
Source21: kdump-in-cluster-environment.txt
Source22: kdump-dep-generator.sh
Source23: kdump-anaconda-addon-005-33-g8b243e3.tar.gz
Source24: kdump-lib-initramfs.sh
Source25: kdump.sysconfig.ppc64le
Source26: kdumpctl.8
Source27: live-image-kdump-howto.txt
Source28: early-kdump-howto.txt
Source23: kdump-lib-initramfs.sh
Source24: kdump.sysconfig.ppc64le
Source25: kdumpctl.8
Source26: live-image-kdump-howto.txt
Source27: early-kdump-howto.txt
#######################################
# These are sources for mkdumpramfs
@ -95,19 +94,12 @@ normal or a panic reboot. This package contains the /sbin/kexec
binary and ancillary utilities that together form the userspace
component of the kernel's kexec feature.
%package anaconda-addon
Summary: Kdump configuration anaconda addon
Requires: anaconda >= 21.33
%description 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 %{SOURCE23}
%ifarch ppc
%define archdef ARCH=ppc
@ -129,8 +121,8 @@ rm -f kexec-tools.spec.in
# setup the docs
cp %{SOURCE10} .
cp %{SOURCE21} .
cp %{SOURCE26} .
cp %{SOURCE27} .
cp %{SOURCE28} .
make
%ifarch %{ix86} x86_64 ppc64 s390x ppc64le aarch64
@ -138,7 +130,6 @@ 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
%endif
make -C kdump-anaconda-addon/po
%install
mkdir -p -m755 $RPM_BUILD_ROOT/sbin
@ -169,9 +160,9 @@ install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/sbin/mkdumprd
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/kdump.conf
install -m 644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8/kexec.8
install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man8/mkdumprd.8
install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_mandir}/man8/kdumpctl.8
install -m 644 %{SOURCE25} $RPM_BUILD_ROOT%{_mandir}/man8/kdumpctl.8
install -m 755 %{SOURCE20} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib.sh
install -m 755 %{SOURCE24} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib-initramfs.sh
install -m 755 %{SOURCE23} $RPM_BUILD_ROOT%{_prefix}/lib/kdump/kdump-lib-initramfs.sh
%ifnarch s390x
# For s390x the ELF header is created in the kdump kernel and therefore kexec
# udev rules are not required
@ -190,8 +181,6 @@ install -m 755 makedumpfile-1.6.4/eppic_makedumpfile.so $RPM_BUILD_ROOT/%{_libdi
mkdir -p $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
install -m 644 makedumpfile-1.6.4/eppic_scripts/* $RPM_BUILD_ROOT/usr/share/makedumpfile/eppic_scripts/
%endif
make -C kdump-anaconda-addon install DESTDIR=$RPM_BUILD_ROOT
%find_lang kdump-anaconda-addon
%define remove_dracut_prefix() %(echo -n %1|sed 's/.*dracut-//g')
%define remove_dracut_early_kdump_prefix() %(echo -n %1|sed 's/.*dracut-early-kdump-//g')
@ -330,11 +319,6 @@ done
/usr/share/makedumpfile/
%endif
%files anaconda-addon -f kdump-anaconda-addon.lang
%{_datadir}/anaconda/addons/com_redhat_kdump
%{_datadir}/icons/hicolor/scalable/apps/kdump.svg
%doc
%changelog
* Thu Jul 26 2018 Dave Young <dyoung@redhat.com> - 2.0.17-8
- Fix armv7hl build failure

1
sources
View File

@ -1,4 +1,3 @@
SHA512 (eppic_050615.tar.gz) = de23c3cd59ded23f2f0092c194b2169e78fcd385a8df7daf34b36f3bb2d5ddac2cdd3657bbe640beec447725988e928962baf62cf9deff8849da734390280a4f
SHA512 (kdump-anaconda-addon-005-33-g8b243e3.tar.gz) = 8ee5e5d314339502fa33a6afb5417ce71d9ae23018968dd982f2b53dd5efae9c7d7ae139a60657ca93e2dc7245a3ca2d4edc05e90c59fb5e56e3e16398bb2530
SHA512 (kexec-tools-2.0.17.tar.xz) = e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6
SHA512 (makedumpfile-1.6.4.tar.gz) = 0d564096a5400074f6154b751ee50c94b8f85a2e3ff478db69ddbb0a47852cbd895594030ca8a2e45a1ca1a641ce5d13f826922fa36054660c23380663f2c080