Hello community,
here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-07-13 17:16: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-19 13:08:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-07-13 17:16:32.000000000 +0200
@@ -1,0 +2,17 @@
+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.
+
+-------------------------------------------------------------------
Old:
----
kdump-0.8.14.tar.bz2
kdump-disable-memory-cgroup.patch
New:
----
kdump-0.8.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdump.spec ++++++
--- /var/tmp/diff_new_pack.bkPLYW/_old 2014-07-13 17:16:33.000000000 +0200
+++ /var/tmp/diff_new_pack.bkPLYW/_new 2014-07-13 17:16:33.000000000 +0200
@@ -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: 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 @@
# 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 @@
%prep
%setup
-%patch0 -p1
%build
export CFLAGS="%optflags"
@@ -126,13 +129,16 @@
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 @@
! 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 @@
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 @@
/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
++++++ kdump-0.8.14.tar.bz2 -> kdump-0.8.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.14/CMakeLists.txt new/kdump-0.8.15/CMakeLists.txt
--- old/kdump-0.8.14/CMakeLists.txt 2014-06-10 14:06:49.000000000 +0200
+++ new/kdump-0.8.15/CMakeLists.txt 2014-06-23 17:47:39.000000000 +0200
@@ -26,7 +26,7 @@
cmake_minimum_required(VERSION 2.6.2)
set (PACKAGE_STRING "kdump")
-set (PACKAGE_VERSION "0.8.14")
+set (PACKAGE_VERSION "0.8.15")
include_directories("${PROJECT_BINARY_DIR}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.14/NEWS new/kdump-0.8.15/NEWS
--- old/kdump-0.8.14/NEWS 2014-06-10 14:06:49.000000000 +0200
+++ new/kdump-0.8.15/NEWS 2014-06-23 17:47:39.000000000 +0200
@@ -1,3 +1,11 @@
+0.8.15
+------
+ * Disable memory cgroup in kdump kernel
+ * Limit the number of CPUs on all architectures
+ * Increase udevd memory requirements
+ * If possible, use wicked to determine network mode
+ * Take number of possible CPUs into account for calibrate
+
0.8.14
------
* Disable ACPI memory hotplug in kdump kernel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.14/init/rc.kdump.functions new/kdump-0.8.15/init/rc.kdump.functions
--- old/kdump-0.8.14/init/rc.kdump.functions 2014-06-10 14:06:49.000000000 +0200
+++ new/kdump-0.8.15/init/rc.kdump.functions 2014-06-23 17:47:39.000000000 +0200
@@ -79,6 +79,14 @@
# Linux 2.6.34+ has nr_cpus, older versions must use maxcpus
function cpus_param()
{
+ # nr_cpus does not work properly on ppc/ppc64/ppc64le
+ case "$(uname -m)" in
+ ppc*)
+ echo maxcpus
+ return 0
+ ;;
+ esac
+
local version=$(get_kernel_version "$1")
version="${version%%-*}"
local verhex=$(IFS=. ; set -- $version ; printf "0x%02x%02x%02x" $1 $2 $3)
@@ -97,25 +105,23 @@
local commandline="$KDUMP_COMMANDLINE"
if [ -z "$commandline" ]; then
+ local nr_cpus=$(cpus_param "$kdump_kernel")
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"
+ commandline="$commandline irqpoll ${nr_cpus}=${KDUMP_CPUS:-1}"
local arch=$(uname -i)
case "$arch" in
- i?86|x86_64|ia64)
- local nr_cpus=$(cpus_param "$kdump_kernel")
- commandline="$commandline irqpoll ${nr_cpus}=${KDUMP_CPUS:-1}"
- if [ "$arch" = "x86_64" -o -z "${arch#i?86}" ]; then
- local boot_apicid=$(
- awk -F':[ \t]' '/^initial apicid[ \t]*:/ {print $2; exit}' \
+ i?86|x86_64)
+ local boot_apicid=$(
+ awk -F':[ \t]' '/^initial apicid[ \t]*:/ {print $2; exit}' \
/proc/cpuinfo)
- test -n "$boot_apicid" &&
- commandline="$commandline disable_cpu_apicid=$boot_apicid"
- fi
- ;;
+ test -n "$boot_apicid" &&
+ commandline="$commandline disable_cpu_apicid=$boot_apicid"
+ ;;
s390*)
commandline="$commandline zfcp.allow_lun_scan=0"
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.14/init/setup-kdump.functions new/kdump-0.8.15/init/setup-kdump.functions
--- old/kdump-0.8.14/init/setup-kdump.functions 2014-06-10 14:06:49.000000000 +0200
+++ new/kdump-0.8.15/init/setup-kdump.functions 2014-06-23 17:47:39.000000000 +0200
@@ -58,6 +58,22 @@
} # }}}
#
+# Get a wicked configuration value for a device
+#
+# Parameters:
+# 1) ifname network interface name
+# 2) conf configuration XPath under /interface
+# Output:
+# configuration value
+function kdump_wicked_conf() # {{{
+{
+ local ifname="$1"
+ local conf="$2"
+
+ wicked show-config | wicked xpath "%{/interface[name='$ifname']/$conf}"
+} # }}}
+
+#
# Determine the default network device.
#
# Output:
@@ -98,6 +114,19 @@
return 0
fi
+ # get mode using wicked if possible
+ if [ -n "$(type -P wicked)" -a \
+ "$(kdump_wicked_conf "$ifname" name)" = "$ifname" ]
+ then
+ local dhcpv4=$(kdump_wicked_conf "$ifname" ipv4:dhcp/enabled)
+ local dhcpv6=$(kdump_wicked_conf "$ifname" ipv6:dhcp/enabled)
+ if [ "$dhcpv4" = true -o "$dhcpv6" = true ] ; then
+ BOOTPROTO=dhcp
+ else
+ BOOTPROTO=static
+ fi
+ fi
+
# get mode from config files
if [ -z "$BOOTPROTO" ] ; then
local cfg=/etc/sysconfig/network/ifcfg-"$ifname"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdump-0.8.14/kdumptool/calibrate.cc new/kdump-0.8.15/kdumptool/calibrate.cc
--- old/kdump-0.8.14/kdumptool/calibrate.cc 2014-06-10 14:06:49.000000000 +0200
+++ new/kdump-0.8.15/kdumptool/calibrate.cc 2014-06-23 17:47:39.000000000 +0200
@@ -17,6 +17,8 @@
* 02110-1301, USA.
*/
#include <iostream>
+#include <fstream>
+#include <cerrno>
#include