Accepting request 239574 from home:ptesarik:branches:Kernel:kdump

update to 0.8.15

OBS-URL: https://build.opensuse.org/request/show/239574
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=98
This commit is contained in:
Petr Tesařík 2014-07-04 12:00:43 +00:00 committed by Git OBS Bridge
parent c5f7c591ff
commit 9aab00953e
2 changed files with 24 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 4 11:48:20 UTC 2014 - ptesarik@suse.cz
- Switch from mkinitrd to dracut for SLES12 and openSUSE > 13.1.
-------------------------------------------------------------------
Fri Jul 4 11:25:25 UTC 2014 - ptesarik@suse.cz

View File

@ -52,10 +52,15 @@ BuildRequires: pkg-config
BuildRequires: udev
BuildRequires: zlib-devel
#!BuildIgnore: fop
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
BuildRequires: systemd
%endif
PreReq: %insserv_prereq %fillup_prereq mkinitrd
PreReq: %insserv_prereq %fillup_prereq
%if 0%{?suse_version} > 1310
PreReq: dracut
%else
PreReq: mkinitrd
%endif
Source: %{name}-%{version}.tar.bz2
Source2: %{name}-rpmlintrc
Source3: kdump.service
@ -66,7 +71,7 @@ Obsoletes: kdump-helpers < %{version}
# update should detect the split-off from kexec-tools
Provides: kexec-tools:/etc/init.d/kdump
Requires: kexec-tools
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
%systemd_requires
%endif
Recommends: nfs-client cifs-utils
@ -124,13 +129,16 @@ mkdir -p $RPM_BUILD_ROOT/sbin
ln -s /etc/init.d/boot.kdump $RPM_BUILD_ROOT/sbin/rckdump
# empty directory
mkdir $RPM_BUILD_ROOT/var/crash
%if 0%{?suse_version} > 1310
rm -r $RPM_BUILD_ROOT/lib/mkinitrd
%endif
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -m644 %{S:3} $RPM_BUILD_ROOT%{_unitdir}
%endif
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
%pre
%service_add_pre kdump.service
%endif
@ -152,14 +160,14 @@ if test -d /var/log/dump && rmdir /var/log/dump &>/dev/null ||
! test -d /var/log/dump ; then
ln -snf /var/crash /var/log/dump
fi
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
%service_add_post kdump.service
%endif
%preun
echo "Stopping kdump ..."
%stop_on_removal boot.kdump
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
%service_del_preun kdump.service
%endif
@ -171,7 +179,7 @@ touch /etc/sysconfig/kdump
rm /var/log/dump &>/dev/null || true
%restart_on_update boot.kdump
%insserv_cleanup
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
%service_del_postun kdump.service
%endif
@ -191,16 +199,18 @@ rm -rf $RPM_BUILD_ROOT
/sbin/rckdump
%{_sysconfdir}/init.d/boot.kdump
/var/adm/fillup-templates/sysconfig.kdump
%if 0%{?suse_version} <= 1310
/lib/mkinitrd/scripts/*-kdump.sh
/lib/mkinitrd/scripts/setup-kdumpfs.sh
/lib/mkinitrd/scripts/setup-mkdumprd.sh
%endif
%dir %{dracutlibdir}
%dir %{dracutlibdir}/modules.d
%{dracutlibdir}/modules.d/99kdump/
%dir /lib/kdump
/lib/kdump/*
%{_udevrulesdir}/70-kdump.rules
%if %suse_version > 1220
%if 0%{?suse_version} > 1220
%{_unitdir}/kdump.service
%endif