Hello community,
here is the log from the commit of package kdump for openSUSE:Factory checked
in at 2019-11-18 20:03:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdump (Old)
and /work/SRC/openSUSE:Factory/.kdump.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump"
Mon Nov 18 20:03:37 2019 rev:107 rq:748662 version:0.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2019-06-27
16:23:22.446358320 +0200
+++ /work/SRC/openSUSE:Factory/.kdump.new.26869/kdump.changes 2019-11-18
20:03:52.117789383 +0100
@@ -1,0 +2,5 @@
+Tue Nov 12 08:11:26 UTC 2019 - Jiri Slaby <jsl...@suse.com>
+
+- add kdump-savedump-search-also-for-vmlinux.xz.patch (bnc#1155921)
+
+-------------------------------------------------------------------
New:
----
kdump-savedump-search-also-for-vmlinux.xz.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdump.spec ++++++
--- /var/tmp/diff_new_pack.Lhevbv/_old 2019-11-18 20:03:53.429788724 +0100
+++ /var/tmp/diff_new_pack.Lhevbv/_new 2019-11-18 20:03:53.437788721 +0100
@@ -62,6 +62,7 @@
Patch14: %{name}-fix-multipath-user_friendly_names.patch
Patch15: %{name}-Add-skip_balance-option-to-BTRFS-mounts.patch
Patch16: %{name}-kdumprd-Look-for-boot-image-and-boot-Image.patch
+Patch17: %{name}-savedump-search-also-for-vmlinux.xz.patch
BuildRequires: asciidoc
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -135,6 +136,7 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
%build
export CFLAGS="%{optflags}"
++++++ kdump-savedump-search-also-for-vmlinux.xz.patch ++++++
From: Jiri Slaby <jsl...@suse.cz>
Date: Wed, 6 Nov 2019 11:35:50 +0100
Subject: savedump: search also for vmlinux.xz
Patch-mainline: yes
Git-commit: f1ef93a2fd465c6590edddc6dc1fcb3978c7f26b
References: bnc#1155921
See https://bugzilla.suse.com/show_bug.cgi?id=1155921
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
kdumptool/savedump.cc | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/kdumptool/savedump.cc b/kdumptool/savedump.cc
index 282f52e71f66..b8b6be13c3f8 100644
--- a/kdumptool/savedump.cc
+++ b/kdumptool/savedump.cc
@@ -596,7 +596,14 @@ string SaveDump::findKernel()
if (binaryroot.exists())
return binary;
- // 3: vmlinuz (check if ELF file)
+ // 3: vmlinux.xz
+ (binary = "/boot").appendPath("vmlinux-" + m_crashrelease + ".xz");
+ (binaryroot = m_rootdir).appendPath(binary);
+ Debug::debug()->dbg("Trying %s", binaryroot.c_str());
+ if (binaryroot.exists())
+ return binary;
+
+ // 4: vmlinuz (check if ELF file)
(binary = "/boot").appendPath("vmlinuz-" + m_crashrelease);
(binaryroot = m_rootdir).appendPath(binary);
Debug::debug()->dbg("Trying %s", binaryroot.c_str());
@@ -605,14 +612,14 @@ string SaveDump::findKernel()
return binary;
}
- // 4: image
+ // 5: image
(binary = "/boot").appendPath("image-" + m_crashrelease);
(binaryroot = m_rootdir).appendPath(binary);
Debug::debug()->dbg("Trying %s", binaryroot.c_str());
if (binaryroot.exists())
return binary;
- // 5: Image
+ // 6: Image
(binary = "/boot").appendPath("Image-" + m_crashrelease);
(binaryroot = m_rootdir).appendPath(binary);
Debug::debug()->dbg("Trying %s", binaryroot.c_str());
--
2.24.0
