From c8542bcf885c6d5fe6861b4ef88f05b9543b8e5b346c629b4bb07e40fe4de731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Mon, 16 Jun 2014 10:59:01 +0000 Subject: [PATCH 1/2] Accepting request 237500 from home:ptesarik:branches:Kernel:kdump Upgrade to 0.8.14 (bugfix release) OBS-URL: https://build.opensuse.org/request/show/237500 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=94 --- kdump-0.8.14.tar.bz2 | 3 +++ kdump-0.8.13-rpmlintrc => kdump-rpmlintrc | 0 kdump.changes | 10 ++++++++++ kdump.spec | 4 ++-- 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 kdump-0.8.14.tar.bz2 rename kdump-0.8.13-rpmlintrc => kdump-rpmlintrc (100%) diff --git a/kdump-0.8.14.tar.bz2 b/kdump-0.8.14.tar.bz2 new file mode 100644 index 0000000..003d421 --- /dev/null +++ b/kdump-0.8.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67e6a549a42f4b78510b5cbe7e377f78df6ea1dcf0ffaf65fb3586dae7fb4bcf +size 3335797 diff --git a/kdump-0.8.13-rpmlintrc b/kdump-rpmlintrc similarity index 100% rename from kdump-0.8.13-rpmlintrc rename to kdump-rpmlintrc diff --git a/kdump.changes b/kdump.changes index 56f8862..7d95eec 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jun 16 10:51:43 UTC 2014 - ptesarik@suse.cz + +- Update to 0.8.14 + o Disable ACPI memory hotplug in kdump kernel (bnc#881091). + o Update kernel and initrd estimates + o Install mount-kdump.sh to dracut module directory (bnc#881851). + +- Remove version number from rpmlintrc. + ------------------------------------------------------------------- Fri May 30 11:31:44 UTC 2014 - ptesarik@suse.cz diff --git a/kdump.spec b/kdump.spec index d82529c..63ba838 100644 --- a/kdump.spec +++ b/kdump.spec @@ -31,7 +31,7 @@ Url: https://github.com/ptesarik/kdump Name: kdump -Version: 0.8.13 +Version: 0.8.14 Release: 0 Requires: curl Requires: makedumpfile @@ -57,7 +57,7 @@ BuildRequires: systemd %endif PreReq: %insserv_prereq %fillup_prereq mkinitrd Source: %{name}-%{version}.tar.bz2 -Source2: %{name}-%{version}-rpmlintrc +Source2: %{name}-rpmlintrc Source3: kdump.service BuildRoot: %{_tmppath}/%{name}-%{version}-build # rename "kdump-helpers" (10.3) -> "kdump" (11.0/SP2) From 4dc45c77b420207a43bd205c771516d909899190931b779c0a6627a77a0f16ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Mon, 16 Jun 2014 11:32:09 +0000 Subject: [PATCH 2/2] Accepting request 237507 from home:ptesarik:branches:Kernel:kdump Remove stale kdump-0.8.13.tar.bz2 Disable memory cgroup in kdump kernel OBS-URL: https://build.opensuse.org/request/show/237507 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kdump?expand=0&rev=95 --- kdump-0.8.13.tar.bz2 | 3 --- kdump-disable-memory-cgroup.patch | 29 +++++++++++++++++++++++++++++ kdump.changes | 6 ++++++ kdump.spec | 2 ++ 4 files changed, 37 insertions(+), 3 deletions(-) delete mode 100644 kdump-0.8.13.tar.bz2 create mode 100644 kdump-disable-memory-cgroup.patch diff --git a/kdump-0.8.13.tar.bz2 b/kdump-0.8.13.tar.bz2 deleted file mode 100644 index a0227bc..0000000 --- a/kdump-0.8.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:519bdd14a31028b77b5c5656fdfc459e9ff69dbd383aa45bb8296a0fe2de4fa3 -size 3335819 diff --git a/kdump-disable-memory-cgroup.patch b/kdump-disable-memory-cgroup.patch new file mode 100644 index 0000000..7b6ca9a --- /dev/null +++ b/kdump-disable-memory-cgroup.patch @@ -0,0 +1,29 @@ +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 7d95eec..9857098 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 16 11:27:57 UTC 2014 - ptesarik@suse.cz + +- kdump-disable-memory-cgroup.patch: disable memory cgroup in the + kdump kernel (bnc#881091). + ------------------------------------------------------------------- Mon Jun 16 10:51:43 UTC 2014 - ptesarik@suse.cz diff --git a/kdump.spec b/kdump.spec index 63ba838..5fa5149 100644 --- a/kdump.spec +++ b/kdump.spec @@ -59,6 +59,7 @@ PreReq: %insserv_prereq %fillup_prereq mkinitrd 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} @@ -96,6 +97,7 @@ Authors: %prep %setup +%patch0 -p1 %build export CFLAGS="%optflags"