forked from pool/kdump
Accepting request 947999 from Kernel:kdump
OBS-URL: https://build.opensuse.org/request/show/947999 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdump?expand=0&rev=120
This commit is contained in:
Git OBS Bridge
commit
5350486b93
@ -1,25 +0,0 @@
|
||||
From 6aaf4b81953c0f181c0f3c08073ba96ffd6a472e Mon Sep 17 00:00:00 2001
|
||||
From: Libor Pechacek <lpechacek@suse.com>
|
||||
Date: Thu, 16 Dec 2021 14:25:56 +0100
|
||||
Subject: [PATCH] mkdumprd: Properly pass compression params
|
||||
|
||||
The compression parameter needs more careful handling so that the
|
||||
individual bits stay together.
|
||||
|
||||
Fixes: 368fbdf62aa8 ("mkdumprd: Do not compress temporary fadump initrd")
|
||||
Signed-off-by: Libor Pechacek <lpechacek@suse.com>
|
||||
---
|
||||
init/mkdumprd | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/init/mkdumprd
|
||||
+++ b/init/mkdumprd
|
||||
@@ -86,7 +86,7 @@ function build_initrd()
|
||||
if [ "$KDUMP_FADUMP" = "yes" ] ; then
|
||||
build_fadumprd
|
||||
else
|
||||
- run_dracut --compress='xz -0 --check=crc32'
|
||||
+ run_dracut --compress \'xz -0 --check=crc32\'
|
||||
fi
|
||||
} # }}}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:72a45e83999656e39a74bc7859f08ee17d578178467ddd5d5c0bf18efc6b4bcd
|
||||
size 3352032
|
||||
3
kdump-1.0.tar.bz2
Normal file
3
kdump-1.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:67c4b4025357052aeb5eb06de9ee9591e16e9c126c917dff9d54f549069afa41
|
||||
size 3367553
|
||||
38
kdump-calibrate-Ignore-malformed-VMCOREINFO.patch
Normal file
38
kdump-calibrate-Ignore-malformed-VMCOREINFO.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 34584498323ae95b1107fb260db876e56d81e3a1 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Tesarik <ptesarik@suse.com>
|
||||
Date: Fri, 21 Jan 2022 15:59:37 +0100
|
||||
Subject: calibrate: Ignore malformed VMCOREINFO lines
|
||||
Patch-mainline: merged
|
||||
Git-commit: 34584498323ae95b1107fb260db876e56d81e3a1
|
||||
|
||||
The vmcoreinfo content is sometimes not terminated properly,
|
||||
producing one or more invalid lines at the end (i.e. without an
|
||||
equal sign). They should be silently ignored.
|
||||
|
||||
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
|
||||
---
|
||||
calibrate/maxrss.py | 13 ++++++++-----
|
||||
1 file changed, 8 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/calibrate/maxrss.py
|
||||
+++ b/calibrate/maxrss.py
|
||||
@@ -61,11 +61,14 @@ try:
|
||||
percpu = int(value.split()[0])
|
||||
|
||||
elif category == 'vmcoreinfo':
|
||||
- (key, value) = data.split('=')
|
||||
- if key == 'PAGESIZE':
|
||||
- pagesize = int(value)
|
||||
- elif key == 'SIZE(page)':
|
||||
- sizeofpage = int(value)
|
||||
+ try:
|
||||
+ (key, value) = data.split('=')
|
||||
+ if key == 'PAGESIZE':
|
||||
+ pagesize = int(value)
|
||||
+ elif key == 'SIZE(page)':
|
||||
+ sizeofpage = int(value)
|
||||
+ except ValueError:
|
||||
+ pass
|
||||
|
||||
else:
|
||||
if cmdline.debug:
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 21 15:03:29 UTC 2022 - Petr Tesařík <ptesarik@suse.com>
|
||||
|
||||
- kdump-calibrate-Ignore-malformed-VMCOREINFO.patch: calibrate:
|
||||
Ignore malformed VMCOREINFO lines (address occasional OBS build
|
||||
failures).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 21 12:58:48 UTC 2022 - Petr Tesařík <ptesarik@suse.com>
|
||||
|
||||
- Update to 1.0
|
||||
* Estimate kdump memory requirements at build time
|
||||
(jsc#SLE-18441).
|
||||
- Remove patches that have been upstreamed:
|
||||
* kdump-0.9.2-mkdumprd-properly-pass-compression-params.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 3 11:56:47 UTC 2022 - Libor Pecháček <lpechacek@suse.com>
|
||||
|
||||
|
||||
44
kdump.spec
44
kdump.spec
@ -21,10 +21,28 @@
|
||||
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
||||
%endif
|
||||
|
||||
%ifarch aarch64
|
||||
%define qemu qemu-arm qemu-uefi-aarch64
|
||||
%else
|
||||
%ifarch %arm
|
||||
%define qemu qemu-arm
|
||||
%else
|
||||
%ifarch %ix86 x86_64
|
||||
%define qemu qemu-x86
|
||||
%else
|
||||
%ifarch %power64
|
||||
%define qemu qemu-ppc
|
||||
%else
|
||||
%define qemu qemu-%{_target_cpu}
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%define dracutlibdir %{_prefix}/lib/dracut
|
||||
|
||||
Name: kdump
|
||||
Version: 0.9.2
|
||||
Version: 1.0
|
||||
Release: 0
|
||||
Summary: Script for kdump
|
||||
License: GPL-2.0-or-later
|
||||
@ -34,17 +52,30 @@ Source: %{name}-%{version}.tar.bz2
|
||||
Source2: %{name}-rpmlintrc
|
||||
Patch1: %{name}-fillupdir-fixes.patch
|
||||
Patch9: %{name}-use-pbl.patch
|
||||
Patch10: %{name}-0.9.2-mkdumprd-properly-pass-compression-params.patch
|
||||
Patch10: %{name}-calibrate-Ignore-malformed-VMCOREINFO.patch
|
||||
BuildRequires: %qemu
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: cmake
|
||||
BuildRequires: cmake >= 3.7
|
||||
BuildRequires: dhcp-client
|
||||
BuildRequires: dracut
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: iputils
|
||||
BuildRequires: kernel-default
|
||||
BuildRequires: libblkid-devel
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: libelf-devel
|
||||
BuildRequires: libesmtp-devel
|
||||
BuildRequires: libmount-devel
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: makedumpfile
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: procps
|
||||
BuildRequires: python3
|
||||
BuildRequires: qemu-ipxe
|
||||
BuildRequires: qemu-vgabios
|
||||
BuildRequires: systemd-sysvinit
|
||||
BuildRequires: util-linux-systemd
|
||||
BuildRequires: wicked
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(udev)
|
||||
@ -110,8 +141,6 @@ export CXXFLAGS="%{optflags} -std=c++11"
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
# remove executable bit from non-binaries
|
||||
chmod -x %{buildroot}/lib/kdump/setup-kdump.functions
|
||||
# empty directory
|
||||
mkdir -p %{buildroot}%{_localstatedir}/crash
|
||||
|
||||
@ -185,11 +214,8 @@ rm %{_localstatedir}/log/dump >/dev/null 2>&1 || true
|
||||
%dir %{dracutlibdir}
|
||||
%dir %{dracutlibdir}/modules.d
|
||||
%{dracutlibdir}/modules.d/*
|
||||
%dir /lib/kdump
|
||||
/lib/kdump/*
|
||||
%dir /usr/lib/kdump
|
||||
/usr/lib/kdump/70-kdump.rules
|
||||
/usr/lib/kdump/kdump-save
|
||||
/usr/lib/kdump/*
|
||||
%{_unitdir}/kdump.service
|
||||
%{_unitdir}/kdump-early.service
|
||||
%{_sbindir}/rckdump
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user