diff --git a/kdump-0.8.14.tar.bz2 b/kdump-0.8.14.tar.bz2 deleted file mode 100644 index 003d421..0000000 --- a/kdump-0.8.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67e6a549a42f4b78510b5cbe7e377f78df6ea1dcf0ffaf65fb3586dae7fb4bcf -size 3335797 diff --git a/kdump-0.8.15.tar.bz2 b/kdump-0.8.15.tar.bz2 new file mode 100644 index 0000000..23d508b --- /dev/null +++ b/kdump-0.8.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d492a9b833e571b32721d949ca140889a48aae38ae2288d7988f6c4e3aa5185 +size 3336592 diff --git a/kdump-disable-memory-cgroup.patch b/kdump-disable-memory-cgroup.patch deleted file mode 100644 index 7b6ca9a..0000000 --- a/kdump-disable-memory-cgroup.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Petr Tesarik -Date: Mon Jun 16 13:26:52 2014 +0200 -Subject: Disable memory cgroup in the kdump kernel -References: bnc#881091 -Patch-mainline: v0.8.15 -Git-commit: 63b43b62fa385f5b2a0326c57cb0821d698aecc8 - -Since cgroups are not used for anything in the kdump kernel, they only -take up part of the precious RAM. It is better to keep them disabled. - -Signed-off-by: Petr Tesarik - -diff --git a/init/rc.kdump.functions b/init/rc.kdump.functions -index 6a42ef7..24c1656 100755 ---- a/init/rc.kdump.functions -+++ b/init/rc.kdump.functions -@@ -99,10 +99,10 @@ function build_kdump_commandline() - if [ -z "$commandline" ]; then - commandline=$( - remove_from_commandline \ -- 'crashkernel|splash|mem|BOOT_IMAGE|showopts|zfcp\.allow_lun_scan|hugepages|acpi_no_memhotplug' \ -+ 'crashkernel|splash|mem|BOOT_IMAGE|showopts|zfcp\.allow_lun_scan|hugepages|acpi_no_memhotplug|cgroup_disable' \ - < /proc/cmdline) - # Use deadline for saving the memory footprint -- commandline="$commandline elevator=deadline sysrq=yes reset_devices acpi_no_memhotplug" -+ commandline="$commandline elevator=deadline sysrq=yes reset_devices acpi_no_memhotplug cgroup_disable=memory" - local arch=$(uname -i) - case "$arch" in - i?86|x86_64|ia64) diff --git a/kdump.changes b/kdump.changes index 9857098..87e41a1 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +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 + +- Update to 0.8.15 + o Disable memory cgroup in kdump kernel + o Limit the number of CPUs on all architectures + o Increase udevd memory requirements + o If possible, use wicked to determine network mode + o Take number of possible CPUs into account for calibrate + +- kdump-disable-memory-cgroup.patch: Dropped. + ------------------------------------------------------------------- Mon Jun 16 11:27:57 UTC 2014 - ptesarik@suse.cz diff --git a/kdump.spec b/kdump.spec index 5fa5149..0e533e5 100644 --- a/kdump.spec +++ b/kdump.spec @@ -31,7 +31,7 @@ Url: https://github.com/ptesarik/kdump Name: kdump -Version: 0.8.14 +Version: 0.8.15 Release: 0 Requires: curl Requires: makedumpfile @@ -52,14 +52,18 @@ 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 -Patch0: %{name}-disable-memory-cgroup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) Provides: kdump-helpers = %{version} @@ -67,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 @@ -97,7 +101,6 @@ Authors: %prep %setup -%patch0 -p1 %build export CFLAGS="%optflags" @@ -126,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 @@ -154,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 @@ -173,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 @@ -193,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