Accepting request 729000 from Kernel:kdump
OBS-URL: https://build.opensuse.org/request/show/729000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/makedumpfile?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
efbb7fd7b0
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5d4f1d6ded8dca6951eeabcf4bb1ebf6575288fee947529397103c040eb5c760
|
||||
size 193093
|
||||
3
makedumpfile-1.6.6.tar.gz
Normal file
3
makedumpfile-1.6.6.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d007eec05cb14f0155f2d06a0d4dc70d321dbb2aec65fccdce953145c8230324
|
||||
size 193625
|
||||
37
makedumpfile-Increase-SECTION_MAP_LAST_BIT-to-4.patch
Normal file
37
makedumpfile-Increase-SECTION_MAP_LAST_BIT-to-4.patch
Normal file
@ -0,0 +1,37 @@
|
||||
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())
|
||||
@ -1,19 +0,0 @@
|
||||
---
|
||||
Makefile | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -8,10 +8,10 @@ ifeq ($(strip $CC),)
|
||||
CC = gcc
|
||||
endif
|
||||
|
||||
-CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
|
||||
+CFLAGS = $(COPTFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
|
||||
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
|
||||
-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"'
|
||||
-CFLAGS_ARCH = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
|
||||
+CFLAGS_ARCH = $(COPTFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
|
||||
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
|
||||
# LDFLAGS = -L/usr/local/lib -I/usr/local/include
|
||||
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 6 13:09:13 UTC 2019 - Petr Tesařík <ptesarik@suse.com>
|
||||
|
||||
- makedumpfile-Increase-SECTION_MAP_LAST_BIT-to-4.patch: Increase
|
||||
SECTION_MAP_LAST_BIT to 4 (bsc#1144708).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 5 18:36:13 UTC 2019 - Petr Tesařík <ptesarik@suse.com>
|
||||
|
||||
- Update to 1.6.6
|
||||
* Support for AMD Secure Memory Encryption
|
||||
* Exclude pages that are logically offline
|
||||
* Support kernels up to 5.1.9
|
||||
- Drop makedumpfile-coptflags.diff.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 5 09:27:33 UTC 2019 - Michal Suchanek <msuchanek@suse.com>
|
||||
|
||||
@ -23,6 +38,7 @@ Thu Jan 24 12:27:37 UTC 2019 - ptesarik@suse.com
|
||||
- Update to 1.6.4
|
||||
* 5-level paging support on x86_64
|
||||
* --mem-usage support for arm64
|
||||
* Support larger VA size with newer ppc64 kernels (bsc#1118445).
|
||||
* Support kernels up to 4.17.0
|
||||
- Drop upstreamed patches:
|
||||
* makedumpfile-always-use-bigger-SECTION_MAP_MASK.patch
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
# End of compatibility cruft
|
||||
|
||||
Name: makedumpfile
|
||||
Version: 1.6.5
|
||||
Version: 1.6.6
|
||||
Release: 0
|
||||
Summary: Partial kernel dump
|
||||
License: GPL-2.0-only
|
||||
@ -40,9 +40,9 @@ Group: System/Kernel
|
||||
Url: https://sourceforge.net/projects/makedumpfile/
|
||||
Source: https://sourceforge.net/projects/makedumpfile/files/makedumpfile/%{version}/%{name}-%{version}.tar.gz
|
||||
Source99: %{name}-rpmlintrc
|
||||
Patch0: %{name}-coptflags.diff
|
||||
Patch1: %{name}-override-libtinfo.patch
|
||||
Patch2: %{name}-ppc64-VA-range-SUSE.patch
|
||||
Patch3: %{name}-Increase-SECTION_MAP_LAST_BIT-to-4.patch
|
||||
BuildRequires: libdw-devel
|
||||
BuildRequires: libebl-devel
|
||||
BuildRequires: libelf-devel
|
||||
@ -70,18 +70,19 @@ via gdb or crash utility.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
%if %{have_snappy}
|
||||
export USESNAPPY=on
|
||||
%endif
|
||||
export USELZO=on
|
||||
export LINKTYPE=dynamic
|
||||
make %{?_smp_mflags} COPTFLAGS="%{optflags}" LDFLAGS="-Wl,-rpath,%{_libdir}/%{name}-%{version}"
|
||||
make %{?_smp_mflags} COPTFLAGS="%{optflags}" eppic_makedumpfile.so %{?ncurses_make_opts}
|
||||
make %{?_smp_mflags} LDFLAGS="-Wl,-rpath,%{_libdir}/%{name}-%{version}"
|
||||
make %{?_smp_mflags} eppic_makedumpfile.so %{?ncurses_make_opts}
|
||||
|
||||
%install
|
||||
install -D -m 0755 makedumpfile %{buildroot}%{_bindir}/makedumpfile
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user