Hello community,
here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-06-19 13:08:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdump (Old)
and /work/SRC/openSUSE:Factory/.kdump.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2014-06-02 07:00:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-06-19 13:08:32.000000000 +0200
@@ -1,0 +2,16 @@
+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
+
+- 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.
+
+-------------------------------------------------------------------
Old:
----
kdump-0.8.13-rpmlintrc
kdump-0.8.13.tar.bz2
New:
----
kdump-0.8.14.tar.bz2
kdump-disable-memory-cgroup.patch
kdump-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdump.spec ++++++
--- /var/tmp/diff_new_pack.zADx7c/_old 2014-06-19 13:08:33.000000000 +0200
+++ /var/tmp/diff_new_pack.zADx7c/_new 2014-06-19 13:08:33.000000000 +0200
@@ -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,8 +57,9 @@
%endif
PreReq: %insserv_prereq %fillup_prereq mkinitrd
Source: %{name}-%{version}.tar.bz2
-Source2: %{name}-%{version}-rpmlintrc
+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 @@
%prep
%setup
+%patch0 -p1
%build
export CFLAGS="%optflags"
++++++ kdump-0.8.13.tar.bz2 -> kdump-0.8.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.13/CMakeLists.txt new/kdump-0.8.14/CMakeLists.txt
--- old/kdump-0.8.13/CMakeLists.txt 2014-05-30 13:24:24.000000000 +0200
+++ new/kdump-0.8.14/CMakeLists.txt 2014-06-10 14:06:49.000000000 +0200
@@ -26,7 +26,7 @@
cmake_minimum_required(VERSION 2.6.2)
set (PACKAGE_STRING "kdump")
-set (PACKAGE_VERSION "0.8.13")
+set (PACKAGE_VERSION "0.8.14")
include_directories("${PROJECT_BINARY_DIR}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.13/NEWS new/kdump-0.8.14/NEWS
--- old/kdump-0.8.13/NEWS 2014-05-30 13:24:24.000000000 +0200
+++ new/kdump-0.8.14/NEWS 2014-06-10 14:06:49.000000000 +0200
@@ -1,3 +1,9 @@
+0.8.14
+------
+ * Disable ACPI memory hotplug in kdump kernel
+ * Update kernel and initrd estimates
+ * Bugfix: install mount-kdump.sh to dracut module directory
+
0.8.13
------
* Store current configuration if KDUMP_NETCONFIG is static
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.13/init/CMakeLists.txt new/kdump-0.8.14/init/CMakeLists.txt
--- old/kdump-0.8.13/init/CMakeLists.txt 2014-05-30 13:24:24.000000000 +0200
+++ new/kdump-0.8.14/init/CMakeLists.txt 2014-06-10 14:06:49.000000000 +0200
@@ -70,6 +70,7 @@
INSTALL(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/module-setup.sh
+ ${CMAKE_CURRENT_SOURCE_DIR}/mount-kdump.sh
DESTINATION
/usr/lib/dracut/modules.d/99kdump
PERMISSIONS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.13/init/rc.kdump.functions new/kdump-0.8.14/init/rc.kdump.functions
--- old/kdump-0.8.13/init/rc.kdump.functions 2014-05-30 13:24:24.000000000 +0200
+++ new/kdump-0.8.14/init/rc.kdump.functions 2014-06-10 14:06:49.000000000 +0200
@@ -99,10 +99,10 @@
if [ -z "$commandline" ]; then
commandline=$(
remove_from_commandline \
- 'crashkernel|splash|mem|BOOT_IMAGE|showopts|zfcp\.allow_lun_scan|hugepages' \
+ 'crashkernel|splash|mem|BOOT_IMAGE|showopts|zfcp\.allow_lun_scan|hugepages|acpi_no_memhotplug' \
< /proc/cmdline)
# Use deadline for saving the memory footprint
- commandline="$commandline elevator=deadline sysrq=yes reset_devices"
+ commandline="$commandline elevator=deadline sysrq=yes reset_devices acpi_no_memhotplug"
local arch=$(uname -i)
case "$arch" in
i?86|x86_64|ia64)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.13/init/setup-kdump.functions new/kdump-0.8.14/init/setup-kdump.functions
--- old/kdump-0.8.13/init/setup-kdump.functions 2014-05-30 13:24:24.000000000 +0200
+++ new/kdump-0.8.14/init/setup-kdump.functions 2014-06-10 14:06:49.000000000 +0200
@@ -81,7 +81,7 @@
eval $( sed -ne '
s/^NetConfig: \(.*\)/BOOTPROTO=\1/p;
s/^Netdevice: \(.*\)/ifname=\1/p;
- s/HWAddr: \(.*\)/hwaddr=\1/p'
+ s/HWAddr: \(.*\)/hwaddr=\1/p' \
"$inffile" )
if [ -n "$hwaddr" ] ; then
for dev in /sys/class/net/* ; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.13/kdumptool/calibrate.cc new/kdump-0.8.14/kdumptool/calibrate.cc
--- old/kdump-0.8.13/kdumptool/calibrate.cc 2014-05-30 13:24:24.000000000 +0200
+++ new/kdump-0.8.14/kdumptool/calibrate.cc 2014-06-10 14:06:49.000000000 +0200
@@ -46,7 +46,7 @@
#if defined(__x86_64__)
# define DEF_RESERVE_KB MB(128)
# define KERNEL_KB MB(16)
-# define INIT_KB MB(26)
+# define INIT_KB MB(28)
# define INIT_NET_KB MB(3)
# define SIZE_STRUCT_PAGE 56
#elif defined(__i386__)
@@ -57,20 +57,20 @@
# define SIZE_STRUCT_PAGE 32
#elif defined(__powerpc64__)
# define DEF_RESERVE_KB MB(256)
-# define KERNEL_KB MB(24)
-# define INIT_KB MB(28)
-# define INIT_NET_KB MB(3)
-# define SIZE_STRUCT_PAGE 56
+# define KERNEL_KB MB(16)
+# define INIT_KB MB(48)
+# define INIT_NET_KB MB(4)
+# define SIZE_STRUCT_PAGE 64
#elif defined(__powerpc__)
# define DEF_RESERVE_KB MB(128)
# define KERNEL_KB MB(12)
-# define INIT_KB MB(24)
+# define INIT_KB MB(28)
# define INIT_NET_KB MB(2)
# define SIZE_STRUCT_PAGE 32
#elif defined(__s390x__)
# define DEF_RESERVE_KB MB(128)
# define KERNEL_KB MB(13)
-# define INIT_KB MB(24)
+# define INIT_KB MB(28)
# define INIT_NET_KB MB(2)
# define SIZE_STRUCT_PAGE 56
#elif defined(__s390__)
@@ -101,6 +101,12 @@
# error "No default crashkernel reservation for your architecture!"
#endif
+// Assume that the kdump kernel gets loaded at 128M (physical)
+// The location is hard to figure out beforehand, so let's just
+// make a reasonable guess here. Getting it wrong shouldn't make
+// the estimate wrong by more than a few hundred KiB...
+#define KDUMP_PHYS_LOAD MB(128)
+
// (Pessimistic) estimate of the initrd compression ratio (percents)
#define INITRD_COMPRESS 50
@@ -232,6 +238,7 @@
// Add space for memmap
prev = required;
required = required * pagesize / (pagesize - SIZE_STRUCT_PAGE);
+ required += KDUMP_PHYS_LOAD * SIZE_STRUCT_PAGE / pagesize / 1024;
Debug::debug()->dbg("Maximum memmap size: %lu KiB", required - prev);
// Make sure there is enough space at boot
++++++ kdump-disable-memory-cgroup.patch ++++++
From: Petr Tesarik