Accepting request 768288 from Kernel:kdump
- makedumpfile-PN_XNUM.patch: Define PN_XNUM if missing. - Update to version 1.6.7: + Makefile: remove -lebl from LIBS when no libebl.a. + Fix compilation warnings on 32-bit system. + Support newer kernels up to v5.4. - Drop makedumpfile-Increase-SECTION_MAP_LAST_BIT-to-4.patch: fixed upstream. - Drop libebl-devel BuildRequires: ebl is being absorbed by libdw. OBS-URL: https://build.opensuse.org/request/show/768288 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/makedumpfile?expand=0&rev=75
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
fb149718f0
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324
|
||||
size 193625
|
||||
3
makedumpfile-1.6.7.tar.gz
Normal file
3
makedumpfile-1.6.7.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e702fbdf62b4cd829a76e46f3e24eb3fc7501918b85ebdcd8baef4f53d6ee2c8
|
||||
size 194672
|
||||
@ -1,37 +0,0 @@
|
||||
From 7bdb468c2c99dd780c9a5321f93c79cbfdce2527 Mon Sep 17 00:00:00 2001
|
||||
From: Kazuhito Hagio <k-hagio@ab.jp.nec.com>
|
||||
Date: Tue, 23 Jul 2019 12:24:47 -0400
|
||||
Subject: [PATCH] Increase SECTION_MAP_LAST_BIT to 4
|
||||
References: bsc#1144708
|
||||
Git-commit: 7bdb468c2c99dd780c9a5321f93c79cbfdce2527
|
||||
Upstream: merged
|
||||
|
||||
kernel commit 326e1b8f83a4 ("mm/sparsemem: introduce a SECTION_IS_EARLY
|
||||
flag") added the flag to mem_section->section_mem_map value, and it caused
|
||||
makedumpfile an error like the following:
|
||||
|
||||
readmem: Can't convert a virtual address(fffffc97d1000000) to physical address.
|
||||
readmem: type_addr: 0, addr:fffffc97d1000000, size:32768
|
||||
__exclude_unnecessary_pages: Can't read the buffer of struct page.
|
||||
create_2nd_bitmap: Can't exclude unnecessary pages.
|
||||
|
||||
To fix this, SECTION_MAP_LAST_BIT needs to be updated. The bit has not
|
||||
been used until the addition, so we can just increase the value.
|
||||
|
||||
Signed-off-by: Kazuhito Hagio <k-hagio@ab.jp.nec.com>
|
||||
Acked-by: Petr Tesarik <ptesarik@suse.com>
|
||||
---
|
||||
makedumpfile.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/makedumpfile.h
|
||||
+++ b/makedumpfile.h
|
||||
@@ -195,7 +195,7 @@ isAnon(unsigned long mapping)
|
||||
* 2. it has been verified that (1UL<<2) was never set, so it is
|
||||
* safe to mask that bit off even in old kernels.
|
||||
*/
|
||||
-#define SECTION_MAP_LAST_BIT (1UL<<3)
|
||||
+#define SECTION_MAP_LAST_BIT (1UL<<4)
|
||||
#define SECTION_MAP_MASK (~(SECTION_MAP_LAST_BIT-1))
|
||||
#define NR_SECTION_ROOTS() divideup(num_section, SECTIONS_PER_ROOT())
|
||||
#define SECTION_NR_TO_PFN(sec) ((sec) << PFN_SECTION_SHIFT())
|
||||
24
makedumpfile-PN_XNUM.patch
Normal file
24
makedumpfile-PN_XNUM.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From: Petr Tesarik <ptesarik@suse.com>
|
||||
Subject: Define PN_XNUM if missing
|
||||
Upstream: never, build fix for old distros
|
||||
|
||||
Older elfutils did not define this constant.
|
||||
|
||||
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
|
||||
---
|
||||
elf_info.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
--- a/elf_info.h
|
||||
+++ b/elf_info.h
|
||||
@@ -19,6 +19,10 @@
|
||||
#include <elf.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
+#ifndef PN_XNUM
|
||||
+#define PN_XNUM 0xffff
|
||||
+#endif
|
||||
+
|
||||
#define KEXEC_CORE_NOTE_NAME "CORE"
|
||||
#define KEXEC_CORE_NOTE_NAME_BYTES sizeof(KEXEC_CORE_NOTE_NAME)
|
||||
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 29 11:51:27 UTC 2020 - Petr Tesařík <ptesarik@suse.com>
|
||||
|
||||
- makedumpfile-PN_XNUM.patch: Define PN_XNUM if missing.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 27 11:37:03 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to version 1.6.7:
|
||||
+ Makefile: remove -lebl from LIBS when no libebl.a.
|
||||
+ Fix compilation warnings on 32-bit system.
|
||||
+ Support newer kernels up to v5.4.
|
||||
- Drop makedumpfile-Increase-SECTION_MAP_LAST_BIT-to-4.patch: fixed
|
||||
upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 27 11:32:48 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop libebl-devel BuildRequires: ebl is being absorbed by libdw.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 6 13:09:13 UTC 2019 - Petr Tesařík <ptesarik@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package makedumpfile
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -32,19 +32,18 @@
|
||||
# End of compatibility cruft
|
||||
|
||||
Name: makedumpfile
|
||||
Version: 1.6.6
|
||||
Version: 1.6.7
|
||||
Release: 0
|
||||
Summary: Partial kernel dump
|
||||
License: GPL-2.0-only
|
||||
Group: System/Kernel
|
||||
Url: https://sourceforge.net/projects/makedumpfile/
|
||||
URL: https://sourceforge.net/projects/makedumpfile/
|
||||
Source: https://sourceforge.net/projects/makedumpfile/files/makedumpfile/%{version}/%{name}-%{version}.tar.gz
|
||||
Source99: %{name}-rpmlintrc
|
||||
Patch1: %{name}-override-libtinfo.patch
|
||||
Patch2: %{name}-ppc64-VA-range-SUSE.patch
|
||||
Patch3: %{name}-Increase-SECTION_MAP_LAST_BIT-to-4.patch
|
||||
Patch3: %{name}-PN_XNUM.patch
|
||||
BuildRequires: libdw-devel
|
||||
BuildRequires: libebl-devel
|
||||
BuildRequires: libelf-devel
|
||||
BuildRequires: libeppic-devel
|
||||
BuildRequires: lzo-devel
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user