Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kdump for openSUSE:Factory checked in at 2021-11-28 21:30:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdump (Old)
and /work/SRC/openSUSE:Factory/.kdump.new.1895 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump"
Sun Nov 28 21:30:00 2021 rev:118 rq:933926 version:0.9.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2021-06-01 10:33:54.644450305 +0200
+++ /work/SRC/openSUSE:Factory/.kdump.new.1895/kdump.changes 2021-11-28 21:30:18.330038444 +0100
@@ -1,0 +2,6 @@
+Thu Nov 25 21:04:51 UTC 2021 - Petr Tesa����k
+
+- kdump-Store-kdump-initrd-in-kernel-image-path.patch: Fix kdumprd
+ location for usrmerge kernels (boo#1190920).
+
+-------------------------------------------------------------------
New:
----
kdump-Store-kdump-initrd-in-kernel-image-path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdump.spec ++++++
--- /var/tmp/diff_new_pack.uhHyJP/_old 2021-11-28 21:30:20.034032992 +0100
+++ /var/tmp/diff_new_pack.uhHyJP/_new 2021-11-28 21:30:20.042032966 +0100
@@ -41,6 +41,7 @@
Patch14: %{name}-fix-incorrect-exit-code-checking.patch
Patch15: %{name}-avoid-endless-loop-on-EAI_AGAIN.patch
Patch16: %{name}-install-real-resolv.conf.patch
+Patch17: %{name}-Store-kdump-initrd-in-kernel-image-path.patch
BuildRequires: asciidoc
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -63,7 +64,9 @@
Requires: openssh
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: %fillup_prereq
-PreReq: /usr/bin/mkdir /usr/bin/rm /usr/bin/touch
+PreReq: /usr/bin/mkdir
+PreReq: /usr/bin/rm
+PreReq: /usr/bin/touch
Recommends: cifs-utils
Recommends: nfs-client
# update should detect the split-off from kexec-tools
@@ -101,6 +104,7 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
%build
export CXXFLAGS="%{optflags} -std=c++11"
++++++ kdump-Store-kdump-initrd-in-kernel-image-path.patch ++++++
From: Petr Tesarik
Date: Thu Nov 25 21:40:15 2021 +0100
Subject: Store kdump initrd in the kernel image path
Upstream: merged
Git-commit: 202eef81d13fb0488f6e462e78ce20841a477c86
If the kernel image is a symlink, store the kdump initrd in the
same directory as the symlink. This fixes kdump for usrmerge
kernels, where the kernel image is under /usr.
Canonical path is still used to get the kernel version.
References: boo#1190920
Signed-off-by: Petr Tesarik
---
kdumptool/findkernel.cc | 4 +---
kdumptool/kerneltool.cc | 5 ++---
2 files changed, 3 insertions(+), 6 deletions(-)
--- a/kdumptool/kerneltool.cc
+++ b/kdumptool/kerneltool.cc
@@ -142,7 +142,7 @@ bool KernelTool::stripImageName(const Fi
string &rest)
{
directory = kernelImage.dirName();
- KString kernel = kernelImage.baseName();
+ KString kernel = kernelImage.getCanonicalPath().baseName();
list<string> imageNames = KernelTool::imageNames(Util::getArch());
for (list<string>::const_iterator it = imageNames.begin();
@@ -470,8 +470,7 @@ Kconfig *KernelTool::retrieveKernelConfi
// at first, search for the config on disk
string dir, stripped;
- if (KernelTool::stripImageName(
- m_kernel.getCanonicalPath(), dir, stripped)) {
+ if (KernelTool::stripImageName(m_kernel, dir, stripped)) {
FilePath config = dir;
config.appendPath("config-" + stripped);
Debug::debug()->dbg("Trying %s for config", config.c_str());
--- a/kdumptool/findkernel.cc
+++ b/kdumptool/findkernel.cc
@@ -313,9 +313,7 @@ string FindKernel::findInitrd(const File
// use the resolved name, not the symlink to generate the initrd
FilePath dir;
string stripped;
- KernelTool::stripImageName(
- kernelPath.getCanonicalPath(), dir, stripped
- );
+ KernelTool::stripImageName(kernelPath, dir, stripped);
string dash;
if (stripped.size() > 0) {