commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2020-06-08 23:50:45
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new.3606 (New)
Package is "makedumpfile"
Mon Jun 8 23:50:45 2020 rev:78 rq:811495 version:1.6.7
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2020-04-10 23:52:38.456671874 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new.3606/makedumpfile.changes
2020-06-08 23:51:34.922761854 +0200
@@ -1,0 +2,6 @@
+Thu Jun 4 09:57:15 UTC 2020 - Petr Tesařík
+
+- makedumpfile-sadump-Fix-failure-of-reading.patch: sadump: Fix
+ failure of reading __per_cpu_load memory (bsc#1168798).
+
+---
New:
makedumpfile-sadump-Fix-failure-of-reading.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.yn9b83/_old 2020-06-08 23:51:35.966765074 +0200
+++ /var/tmp/diff_new_pack.yn9b83/_new 2020-06-08 23:51:35.966765074 +0200
@@ -45,6 +45,7 @@
Patch3: %{name}-PN_XNUM.patch
Patch4: %{name}-arm64-Align-PMD_SECTION_MASK-with-PHYS_MASK.patch
Patch5: %{name}-Fix-cd_header-offset-overflow-with-large-pfn.patch
+Patch6: %{name}-sadump-Fix-failure-of-reading.patch
BuildRequires: libdw-devel
BuildRequires: libelf-devel
BuildRequires: libeppic-devel
++ makedumpfile-sadump-Fix-failure-of-reading.patch ++
From: "saito.kaz...@fujitsu.com"
Date: Thu, 21 May 2020 07:15:19 +
Subject: sadump: Fix failure of reading __per_cpu_load memory
References: bsc#1168798
Upstream: merged
Git-commit: c9e078531efaffbe6f780221d40bdac21a84855b
Creating vmcore from sadump by makedumpfile fails with the following
error messages since kernel-4.19 with PTI (Page Table Isolation)
enabled:
__vtop4_x86_64: Can't get a valid pte.
readmem: Can't convert a virtual address(b2986000) to physical
address.
readmem: type_addr: 0, addr:b2986000, size:8
per_cpu_init: Can't read __per_cpu_load memory.
This is caused by the following patch:
https://github.com/torvalds/linux/commit/c40a56a7818cfe735fc93a69e1875f8bba834483
The above patch clears _PAGE_PRESENT bit of __per_cpu_load memory, so
__vtop4_x86_64 fails to convert the virtual address of the
__per_cpu_load.
To fix this issue, this patch changes sanity check of per_cpu_ptr()
to use address of the __per_cpu_load instead of data of the memory.
Signed-off-by: Kazuya Saito
Signed-off-by: Kiyotaka Nakamura
---
sadump_info.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sadump_info.c b/sadump_info.c
index 46867ce..72a077b 100644
--- a/sadump_info.c
+++ b/sadump_info.c
@@ -1732,11 +1732,11 @@ per_cpu_init(void)
return FALSE;
}
- if (!readmem(VADDR, SYMBOL(__per_cpu_load), >__per_cpu_load,
-sizeof(unsigned long))) {
- ERRMSG("Can't read __per_cpu_load memory.\n");
+ if (SYMBOL(__per_cpu_load) == NOT_FOUND_SYMBOL) {
+ ERRMSG("Can't find __per_cpu_load symbol.\n");
return FALSE;
}
+ si->__per_cpu_load = SYMBOL(__per_cpu_load);
DEBUG_MSG("sadump: __per_cpu_load: %#lx\n", si->__per_cpu_load);
DEBUG_MSG("sadump: __per_cpu_offset: LENGTH: %ld\n",
--
2.26.2
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2020-04-10 23:52:27
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new.3248 (New)
Package is "makedumpfile"
Fri Apr 10 23:52:27 2020 rev:77 rq:791930 version:1.6.7
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2020-03-19 19:49:59.720173583 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new.3248/makedumpfile.changes
2020-04-10 23:52:38.456671874 +0200
@@ -1,0 +2,14 @@
+Fri Apr 3 05:51:49 UTC 2020 - Martin Liška
+
+- Add -fcommon in order to fix boo#1160282.
+
+---
+Wed Apr 1 06:11:18 UTC 2020 - Michal Suchanek
+
+- Refresh patch with upstream version
+ - makedumpfile-arm64-VA-range-SUSE.patch
+ + makedumpfile-arm64-Align-PMD_SECTION_MASK-with-PHYS_MASK.patch
+- makedumpfile-Fix-cd_header-offset-overflow-with-large-pfn.patch: Fix integer
+ overflow with large memory configuration (bsc#1168234).
+
+---
Old:
makedumpfile-arm64-VA-range-SUSE.patch
New:
makedumpfile-Fix-cd_header-offset-overflow-with-large-pfn.patch
makedumpfile-arm64-Align-PMD_SECTION_MASK-with-PHYS_MASK.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.r0nKjG/_old 2020-04-10 23:52:40.712673528 +0200
+++ /var/tmp/diff_new_pack.r0nKjG/_new 2020-04-10 23:52:40.716673531 +0200
@@ -43,7 +43,8 @@
Patch1: %{name}-override-libtinfo.patch
Patch2: %{name}-ppc64-VA-range-SUSE.patch
Patch3: %{name}-PN_XNUM.patch
-Patch4: %{name}-arm64-VA-range-SUSE.patch
+Patch4: %{name}-arm64-Align-PMD_SECTION_MASK-with-PHYS_MASK.patch
+Patch5: %{name}-Fix-cd_header-offset-overflow-with-large-pfn.patch
BuildRequires: libdw-devel
BuildRequires: libelf-devel
BuildRequires: libeppic-devel
@@ -73,7 +74,7 @@
%autopatch -p1
%build
-export CFLAGS="%{optflags}"
+export CFLAGS="%{optflags} -fcommon"
%if %{have_snappy}
export USESNAPPY=on
%endif
++ makedumpfile-Fix-cd_header-offset-overflow-with-large-pfn.patch ++
>From 6e4b2dfaed5e5e5c617e0e45f969c1f571c13e27 Mon Sep 17 00:00:00 2001
From: Jialong Chen
Date: Mon, 23 Mar 2020 16:42:01 -0400
Subject: Fix cd_header offset overflow with large pfn
Upstream: merged (expected 1.6.8)
Git-commit: 6e4b2dfaed5e5e5c617e0e45f969c1f571c13e27
In function write_kdump_pages_and_bitmap_cyclic(), cd_header->offset is
calculated by the following formula:
cd_header->offset
= (DISKDUMP_HEADER_BLOCKS + dh->sub_hdr_size + dh->bitmap_blocks)
* dh->block_size;
However, the variables of the right side are only int and unsigned int,
so if dh->bitmap_blocks is very large, it causes an interger overflow.
As a result, makedumpfile created a broken vmcore in a system with a
physical address range from 0x602770ecf000 to 0x6027, and the
crash utility failed during session initialization, ending with the
error message "crash: vmlinux and vmcore do not match!".
Signed-off-by: Jialong Chen
Signed-off-by: Kazuhito Hagio
---
diskdump_mod.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diskdump_mod.h b/diskdump_mod.h
index 267681712a2a..3733953dee12 100644
--- a/diskdump_mod.h
+++ b/diskdump_mod.h
@@ -22,7 +22,7 @@
#define DISK_DUMP_SIGNATURE"DISKDUMP"
#define KDUMP_SIGNATURE"KDUMP "
#define SIG_LEN (sizeof(DUMP_PARTITION_SIGNATURE) - 1)
-#define DISKDUMP_HEADER_BLOCKS (1)
+#define DISKDUMP_HEADER_BLOCKS (1UL)
/*
* These are all remnants of the old "diskdump" facility,
--
2.23.0
++ makedumpfile-arm64-Align-PMD_SECTION_MASK-with-PHYS_MASK.patch ++
>From 7242ae4cb5288df626f464ced0a8b60fd669100b Mon Sep 17 00:00:00 2001
From: Michal Suchanek
Date: Mon, 16 Mar 2020 19:39:58 +0100
Subject: Align PMD_SECTION_MASK with PHYS_MASK
Upstream: merged (expected 1.6.8)
Git-commit: 7242ae4cb5288df626f464ced0a8b60fd669100b
Reportedly on some arm64 systems makedumpfile loops forever exhausting
all memory when filtering kernel core. It turns out the reason is it
cannot resolve some addresses because the PMD mask is wrong. When
physical address mask allows up to 48bits pmd mask should allow the
same.
I suppose you would need a system that needs physical addresses over 1TB
to be able to reproduce this. This may be either because you have a lot
of memory or because the firmware mapped some memory above 1TB for some
reason.
Signed-off-by: Michal Suchanek
---
arch/arm64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2020-03-19 19:46:39
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new.3160 (New)
Package is "makedumpfile"
Thu Mar 19 19:46:39 2020 rev:76 rq:785651 version:1.6.7
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2020-02-04 19:51:47.329266852 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new.3160/makedumpfile.changes
2020-03-19 19:49:59.720173583 +0100
@@ -1,0 +2,6 @@
+Wed Mar 4 13:45:23 UTC 2020 - Michal Suchanek
+
+- makedumpfile-arm64-VA-range-SUSE.patch: Fix error processing core files on
+ arm64 (bsc#1142715).
+
+---
New:
makedumpfile-arm64-VA-range-SUSE.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.T4aTEO/_old 2020-03-19 19:50:00.156173834 +0100
+++ /var/tmp/diff_new_pack.T4aTEO/_new 2020-03-19 19:50:00.156173834 +0100
@@ -43,6 +43,7 @@
Patch1: %{name}-override-libtinfo.patch
Patch2: %{name}-ppc64-VA-range-SUSE.patch
Patch3: %{name}-PN_XNUM.patch
+Patch4: %{name}-arm64-VA-range-SUSE.patch
BuildRequires: libdw-devel
BuildRequires: libelf-devel
BuildRequires: libeppic-devel
@@ -69,9 +70,7 @@
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%autopatch -p1
%build
export CFLAGS="%{optflags}"
++ makedumpfile-arm64-VA-range-SUSE.patch ++
Subject: Align PMD_SECTION_MASK with CONFIG_ARM64_VA_BITS
References: bsc#1142715
Since SUSE 4.12 kernel the VA renge is increased to 48 bits.
Upstream proposed to export the VA range in vmcoreinfo but we did not backport
the patch.
Link: https://lists.infradead.org/pipermail/kexec/2019-November/023966.html
Link: https://patchwork.kernel.org/cover/11266557/
diff -ur makedumpfile-1.6.7.orig/arch/arm64.c makedumpfile-1.6.7/arch/arm64.c
--- makedumpfile-1.6.7.orig/arch/arm64.c2020-01-15 19:09:56.0
+0100
+++ makedumpfile-1.6.7/arch/arm64.c 2020-03-04 14:38:02.281783810 +0100
@@ -81,7 +81,7 @@
* Remove the highest order bits that are not a part of the
* physical address in a section
*/
-#define PMD_SECTION_MASK ((1UL << 40) - 1)
+#define PMD_SECTION_MASK ((1UL << 48) - 1)
#define PMD_TYPE_MASK 3
#define PMD_TYPE_SECT 1
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2020-02-04 19:51:24
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new.26092 (New)
Package is "makedumpfile"
Tue Feb 4 19:51:24 2020 rev:75 rq:768288 version:1.6.7
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2019-09-11 10:23:45.075485763 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new.26092/makedumpfile.changes
2020-02-04 19:51:47.329266852 +0100
@@ -1,0 +2,20 @@
+Wed Jan 29 11:51:27 UTC 2020 - Petr Tesařík
+
+- makedumpfile-PN_XNUM.patch: Define PN_XNUM if missing.
+
+---
+Mon Jan 27 11:37:03 UTC 2020 - Dominique Leuenberger
+
+- 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
+
+- Drop libebl-devel BuildRequires: ebl is being absorbed by libdw.
+
+---
Old:
makedumpfile-1.6.6.tar.gz
makedumpfile-Increase-SECTION_MAP_LAST_BIT-to-4.patch
New:
makedumpfile-1.6.7.tar.gz
makedumpfile-PN_XNUM.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.fYfT90/_old 2020-02-04 19:51:48.217267370 +0100
+++ /var/tmp/diff_new_pack.fYfT90/_new 2020-02-04 19:51:48.225267375 +0100
@@ -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
++ makedumpfile-1.6.6.tar.gz -> makedumpfile-1.6.7.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.6/Makefile
new/makedumpfile-1.6.7/Makefile
--- old/makedumpfile-1.6.6/Makefile 2019-06-27 14:42:40.0 +0200
+++ new/makedumpfile-1.6.7/Makefile 2020-01-15 19:09:56.0 +0100
@@ -1,7 +1,7 @@
# makedumpfile
-VERSION=1.6.6
-DATE=27 Jun 2019
+VERSION=1.6.7
+DATE=16 Jan 2020
# Honour the environment variable CC
ifeq ($(strip $CC),)
@@ -50,7 +50,7 @@
SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c
arch/ppc64.c arch/s390x.c arch/ppc.c arch/sparc64.c
OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
-LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
+LIBS = -ldw -lbz2 -ldl -lelf -lz
ifneq ($(LINKTYPE), dynamic)
LIBS := -static $(LIBS)
endif
@@ -79,6 +79,11 @@
LIBS := $(LIBS) $(call try-run,\
echo $(LINK_TEST_PROG) | $(CC) $(CFLAGS) -o "$$TMP" -x c -,,-lrt)
+# elfutils-0.178 or later does not install libebl.a.
+LINK_TEST_PROG="int main() { return 0; }"
+LIBS := $(LIBS) $(call try-run,\
+ echo $(LINK_TEST_PROG) | $(CC) -o "$$TMP" -x c - -lebl,-lebl,)
+
all: makedumpfile
$(OBJ_PART): $(SRC_PART)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.6/README
new/makedumpfile-1.6.7/README
--- old/makedumpfile-1.6.6/README 2019-06-27 14:42:40.0 +0200
+++ new/makedumpfile-1.6.7/README 2020-01-15 19:09:56.0 +0100
@@ -6,13 +6,13 @@
* REQUIREMENTS
Please download the following library file and install it exactly as below;
do NOT use "make install".
- - elfutils-0.142.tar.gz
+ - elfutils-0.144.tar.gz
The "make install" of elfutils installs some commands (ld, readelf, etc.),
and compiling problems
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2019-09-11 10:23:42
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new.7948 (New)
Package is "makedumpfile"
Wed Sep 11 10:23:42 2019 rev:74 rq:729000 version:1.6.6
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2019-08-16 15:33:09.149917308 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new.7948/makedumpfile.changes
2019-09-11 10:23:45.075485763 +0200
@@ -1,0 +2,15 @@
+Fri Sep 6 13:09:13 UTC 2019 - Petr Tesařík
+
+- 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
+
+- 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.
+
+---
@@ -25,0 +41 @@
+ * Support larger VA size with newer ppc64 kernels (bsc#1118445).
Old:
makedumpfile-1.6.5.tar.gz
makedumpfile-coptflags.diff
New:
makedumpfile-1.6.6.tar.gz
makedumpfile-Increase-SECTION_MAP_LAST_BIT-to-4.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.v1qLJi/_old 2019-09-11 10:23:46.711485560 +0200
+++ /var/tmp/diff_new_pack.v1qLJi/_new 2019-09-11 10:23:46.75548 +0200
@@ -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 @@
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 @@
%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
++ makedumpfile-1.6.5.tar.gz -> makedumpfile-1.6.6.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.5/Makefile
new/makedumpfile-1.6.6/Makefile
--- old/makedumpfile-1.6.5/Makefile 2018-12-04 21:21:52.0 +0100
+++ new/makedumpfile-1.6.6/Makefile 2019-06-27 14:42:40.0 +0200
@@ -1,18 +1,17 @@
# makedumpfile
-VERSION=1.6.5
-DATE=5 Dec 2018
+VERSION=1.6.6
+DATE=27 Jun 2019
# Honour the environment variable CC
ifeq ($(strip $CC),)
CC = gcc
endif
-CFLAGS = -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 \
- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS_BASE := $(CFLAGS) -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \
+ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS := $(CFLAGS_BASE) -DVERSION='"$(VERSION)"'
-DRELEASE_DATE='"$(DATE)"'
+CFLAGS_ARCH := $(CFLAGS_BASE)
# LDFLAGS = -L/usr/local/lib -I/usr/local/include
HOST_ARCH := $(shell uname -m)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.5/README
new/makedumpfile-1.6.6/README
--- old/makedumpfile-1.6.5/README 2018-12-04 21:21:52.0 +0100
+++ new/makedumpfile-1.6.6/README 2019-06-27 14:42:40.0 +0200
@@ -127,6 +127,9 @@
4.17 | OK | ** |||| ** || -- | OK | OK |||
4.18 | OK | ** |||| ** || -- | OK | OK |||
4.19 | OK | ** |||| ** || -- | OK | OK |||
+ 4.20 | OK | ** |||| ** || -- | OK | OK |||
+ 5.0| OK | ** |
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2019-08-16 15:33:06
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new.22127 (New)
Package is "makedumpfile"
Fri Aug 16 15:33:06 2019 rev:73 rq:723314 version:1.6.5
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2019-02-17 12:18:57.828239750 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new.22127/makedumpfile.changes
2019-08-16 15:33:09.149917308 +0200
@@ -1,0 +2,6 @@
+Fri Jul 5 09:27:33 UTC 2019 - Michal Suchanek
+
+- Also support extended address space with SLE 12 SP5 (bsc#1138451)
+ * refresh makedumpfile-ppc64-VA-range-SUSE.patch
+
+---
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.PCmosw/_old 2019-08-16 15:33:10.837916817 +0200
+++ /var/tmp/diff_new_pack.PCmosw/_new 2019-08-16 15:33:10.861916810 +0200
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
++ makedumpfile-ppc64-VA-range-SUSE.patch ++
--- /var/tmp/diff_new_pack.PCmosw/_old 2019-08-16 15:33:11.273916690 +0200
+++ /var/tmp/diff_new_pack.PCmosw/_new 2019-08-16 15:33:11.305916681 +0200
@@ -12,22 +12,24 @@
makedumpfile.c |4
makedumpfile.h |3 +++
3 files changed, 9 insertions(+), 1 deletion(-)
-
a/makedumpfile.h
-+++ b/makedumpfile.h
-@@ -1936,6 +1936,9 @@ struct number_table {
- unsigned long PHYS_OFFSET;
- unsigned long kimage_voffset;
- #endif
-+
-+ /* Distro-specific */
-+ longSUSE_PRODUCT_CODE;
- };
+diff -ur a/arch/ppc64.c b/arch/ppc64.c
+--- a/arch/ppc64.c 2018-12-04 21:21:52.0 +0100
b/arch/ppc64.c 2019-07-05 11:25:20.318510887 +0200
+@@ -248,7 +248,9 @@
- struct srcfile_table {
a/makedumpfile.c
-+++ b/makedumpfile.c
-@@ -2296,6 +2296,8 @@ write_vmcoreinfo_data(void)
+ if (info->kernel_version >= KERNEL_VERSION(4, 12, 0)) {
+ info->l2_index_size =
PMD_INDEX_SIZE_L4_64K_4_12;
+- if (info->kernel_version >= KERNEL_VERSION(4,
17, 0))
++ if (info->kernel_version >= KERNEL_VERSION(4,
17, 0) ||
++ ((NUMBER(SUSE_PRODUCT_CODE) & ~0xffL) ==
0x010f0100) ||
++ ((NUMBER(SUSE_PRODUCT_CODE) & ~0xffL) ==
0x010c0500))
+ info->l3_index_size =
PUD_INDEX_SIZE_L4_64K_4_17;
+ else
+ info->l3_index_size =
PUD_INDEX_SIZE_L4_64K_4_12;
+diff -ur a/makedumpfile.c b/makedumpfile.c
+--- a/makedumpfile.c 2018-12-04 21:21:52.0 +0100
b/makedumpfile.c 2019-07-05 11:23:32.357093984 +0200
+@@ -2296,6 +2296,8 @@
WRITE_NUMBER_UNSIGNED("kimage_voffset", kimage_voffset);
#endif
@@ -36,7 +38,7 @@
if (info->phys_base)
fprintf(info->file_vmcoreinfo, "%s%lu\n",
STR_NUMBER("phys_base"),
info->phys_base);
-@@ -2696,6 +2698,8 @@ read_vmcoreinfo(void)
+@@ -2696,6 +2698,8 @@
READ_NUMBER("HUGETLB_PAGE_DTOR", HUGETLB_PAGE_DTOR);
@@ -45,15 +47,16 @@
return TRUE;
}
a/arch/ppc64.c
-+++ b/arch/ppc64.c
-@@ -248,7 +248,8 @@ ppc64_vmalloc_init(void)
+diff -ur a/makedumpfile.h b/makedumpfile.h
+--- a/makedumpfile.h 2018-12-04 21:21:52.0 +0100
b/makedumpfile.h 2019-07-05 11:23:32.353093931 +0200
+@@ -1936,6 +1936,9 @@
+ unsigned long PHYS_OFFSET;
+ unsigned long kimage_voffset;
+ #endif
++
++ /* Distro-specific */
++ longSUSE_PRODUCT_CODE;
+ };
- if (info->kernel_version >= KERNEL_VERSION(4, 12, 0)) {
- info->l2_index_size =
PMD_INDEX_SIZE_L4_64K_4_12;
-- if (info->kernel_version >= KERNEL_VERSION(4,
17, 0))
-+ if (info->kernel_version >= KERNEL_VERSION(4,
17, 0) ||
-+ (NUMBER(SUSE_PRODUCT_CODE) & ~0xffL) ==
0x010f0100)
- info->l3_index_size =
PUD_INDEX_SIZE_L4_64K_4_17;
- else
- info->l3_index_size =
PUD_INDEX_SIZE_L4_64K_4_12;
+ struct srcfile_table {
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2019-02-17 12:18:52
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new.28833 (New)
Package is "makedumpfile"
Sun Feb 17 12:18:52 2019 rev:72 rq:676211 version:1.6.5
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2019-01-26 22:20:24.662953052 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new.28833/makedumpfile.changes
2019-02-17 12:18:57.828239750 +0100
@@ -1,0 +2,13 @@
+Thu Feb 14 17:41:26 UTC 2019 - ptesa...@suse.com
+
+- makedumpfile-ppc64-VA-range-SUSE.patch: Use correct l3 index size
+ with SLE15-SP1 ppc64le kernels (bsc#1123015).
+
+---
+Thu Feb 14 12:24:55 UTC 2019 - ptesa...@suse.com
+
+- Update to 1.6.5
+ * Improve support for arm64 system with KASLR
+ * Support kernels up to 4.19.4
+
+---
Old:
makedumpfile-1.6.4.tar.gz
New:
makedumpfile-1.6.5.tar.gz
makedumpfile-ppc64-VA-range-SUSE.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.38gYYh/_old 2019-02-17 12:18:58.468239575 +0100
+++ /var/tmp/diff_new_pack.38gYYh/_new 2019-02-17 12:18:58.472239573 +0100
@@ -32,7 +32,7 @@
# End of compatibility cruft
Name: makedumpfile
-Version:1.6.4
+Version:1.6.5
Release:0
Summary:Partial kernel dump
License:GPL-2.0-only
@@ -42,6 +42,7 @@
Source99: %{name}-rpmlintrc
Patch0: %{name}-coptflags.diff
Patch1: %{name}-override-libtinfo.patch
+Patch2: %{name}-ppc64-VA-range-SUSE.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
@@ -71,6 +72,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%if %{have_snappy}
++ makedumpfile-1.6.4.tar.gz -> makedumpfile-1.6.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.4/Makefile
new/makedumpfile-1.6.5/Makefile
--- old/makedumpfile-1.6.4/Makefile 2018-07-03 20:52:46.0 +0200
+++ new/makedumpfile-1.6.5/Makefile 2018-12-04 21:21:52.0 +0100
@@ -1,7 +1,7 @@
# makedumpfile
-VERSION=1.6.4
-DATE=3 Jul 2018
+VERSION=1.6.5
+DATE=5 Dec 2018
# Honour the environment variable CC
ifeq ($(strip $CC),)
@@ -68,6 +68,18 @@
LIBS := -lpthread $(LIBS)
+try-run = $(shell set -e; \
+ TMP="..tmp";\
+ if ($(1)) >/dev/null 2>&1; \
+ then echo "$(2)"; \
+ else echo "$(3)"; \
+ fi; \
+ rm -f "$$TMP")
+
+LINK_TEST_PROG="int clock_gettime(); int main(){ return clock_gettime(); }"
+LIBS := $(LIBS) $(call try-run,\
+ echo $(LINK_TEST_PROG) | $(CC) $(CFLAGS) -o "$$TMP" -x c -,,-lrt)
+
all: makedumpfile
$(OBJ_PART): $(SRC_PART)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.4/README
new/makedumpfile-1.6.5/README
--- old/makedumpfile-1.6.4/README 2018-07-03 20:52:46.0 +0200
+++ new/makedumpfile-1.6.5/README 2018-12-04 21:21:52.0 +0100
@@ -125,6 +125,8 @@
4.15 | OK | ** |||| ** || -- | OK | OK |||
4.16 | OK | ** |||| ** || -- | OK | OK |||
4.17 | OK | ** |||| ** || -- | OK | OK |||
+ 4.18 | OK | ** |||| ** || -- | OK | OK |||
+ 4.19 | OK | ** |||| ** || -- | OK | OK |||
OK: Support.
--: Not support.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.4/arch/arm64.c
new/makedumpfile-1.6.5/arch/arm64.c
--- old/makedumpfile-1.6.4/arch/arm64.c 2018-07-03 20:52:46.0 +0200
+++ new/makedumpfile-1.6.5/arch/arm64.c 2018-12-04 21:21:52.0 +0100
@@ -174,11 +174,76 @@
int
get_phys_base_arm64(void)
{
- info->phys_base = NUMBER(PHYS_OFFSET);
+ int i;
+ unsigned long long phys_start;
+ unsigned long long virt_start;
+
+ if (NUMBER(PHYS_OFFSET) != NOT_FOUND_NUMBER) {
+ info->phys_base = NUMBER(PHYS_OFFSET);
+ DEBUG_MSG("phys_base: %lx (vmcoreinfo)\n",
+ info->phys_base);
+ return TRUE;
+ }
+
+ if (get_num_pt_loads() && PAGE_OFFSET) {
+ for (i = 0;
+ get_pt_load(i, _start, NULL, _start, NULL);
+ i++) {
+
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2019-01-26 22:20:23
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new.28833 (New)
Package is "makedumpfile"
Sat Jan 26 22:20:23 2019 rev:71 rq:668315 version:1.6.4
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2018-09-13 12:08:36.494489963 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new.28833/makedumpfile.changes
2019-01-26 22:20:24.662953052 +0100
@@ -1,0 +2,14 @@
+Thu Jan 24 12:27:37 UTC 2019 - ptesa...@suse.com
+
+- Update to 1.6.4
+ * 5-level paging support on x86_64
+ * --mem-usage support for arm64
+ * Support kernels up to 4.17.0
+- Drop upstreamed patches:
+ * makedumpfile-always-use-bigger-SECTION_MAP_MASK.patch
+ * makedumpfile-sadump-fix-PTI-enabled-kernels.patch
+ * makedumpfile-do-not-print-ETA-if-progress-is-0.patch
+ * makedumpfile-is_cache_page-helper.patch
+ * makedumpfile-check-PG_swapbacked.patch
+
+---
Old:
makedumpfile-1.6.3.tar.gz
makedumpfile-always-use-bigger-SECTION_MAP_MASK.patch
makedumpfile-check-PG_swapbacked.patch
makedumpfile-do-not-print-ETA-if-progress-is-0.patch
makedumpfile-is_cache_page-helper.patch
makedumpfile-sadump-fix-PTI-enabled-kernels.patch
New:
makedumpfile-1.6.4.tar.gz
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.mI6KGz/_old 2019-01-26 22:20:25.154952653 +0100
+++ /var/tmp/diff_new_pack.mI6KGz/_new 2019-01-26 22:20:25.158952650 +0100
@@ -1,7 +1,7 @@
#
# spec file for package makedumpfile
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,12 +24,15 @@
%endif
%endif
+# Compatibility cruft
+# there is no separate -ltinfo until openSUSE 13.1
%if 0%{?suse_version} < 1310 && 0%{?sles_version} < 12
%define ncurses_make_opts TINFOLIB=-lncurses
%endif
+# End of compatibility cruft
Name: makedumpfile
-Version:1.6.3
+Version:1.6.4
Release:0
Summary:Partial kernel dump
License:GPL-2.0-only
@@ -39,11 +42,6 @@
Source99: %{name}-rpmlintrc
Patch0: %{name}-coptflags.diff
Patch1: %{name}-override-libtinfo.patch
-Patch2: %{name}-always-use-bigger-SECTION_MAP_MASK.patch
-Patch3: %{name}-sadump-fix-PTI-enabled-kernels.patch
-Patch4: %{name}-do-not-print-ETA-if-progress-is-0.patch
-Patch5: %{name}-is_cache_page-helper.patch
-Patch6: %{name}-check-PG_swapbacked.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
@@ -73,11 +71,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
%if %{have_snappy}
@@ -97,13 +90,17 @@
install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts
install -m 0644 -t %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts/
eppic_scripts/*
-%if 0%{?_defaultlicensedir:1}
+# Compatibility cruft
+# there is no %license prior to SLE12
+%if %{undefined _defaultlicensedir}
+%define license %doc
+%else
+# filesystem before SLE12 SP3 lacks /usr/share/licenses
%if 0%(test ! -d %{_defaultlicensedir} && echo 1)
%define _defaultlicensedir %_defaultdocdir
%endif
-%else
-%define license %doc
%endif
+# End of compatibility cruft
%files
%defattr(-,root,root)
++ makedumpfile-1.6.3.tar.gz -> makedumpfile-1.6.4.tar.gz ++
2050 lines of diff (skipped)
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2018-09-13 12:08:32
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Thu Sep 13 12:08:32 2018 rev:70 rq:633586 version:1.6.3
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2018-05-06 14:56:37.935674596 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2018-09-13 12:08:36.494489963 +0200
@@ -1,0 +2,26 @@
+Fri Aug 24 13:06:51 UTC 2018 - ptesa...@suse.com
+
+- Fix %license destination for older distributions.
+
+---
+Fri Aug 24 09:01:03 UTC 2018 - ptesa...@suse.com
+
+- Merge SLE12 changelog.
+- Patches that were never actually applied to Factory:
+ * makedumpfile-x86_64-xen-vtop.patch (included in 1.6.2)
+ * makedumpfile-Fix-elf_info-file_size-if-segment-excluded.patch
+(included in 1.6.2)
+
+---
+Fri Jun 29 07:46:05 UTC 2018 - ptesa...@suse.com
+
+- makedumpfile-Fix-elf_info-file_size-if-segment-excluded.patch:
+ elf_info: Fix file_size if segment is excluded (bsc#1068925).
+
+---
+Thu Jun 28 13:12:23 UTC 2018 - ptesa...@suse.com
+
+- makedumpfile-x86_64-xen-vtop.patch: Fix the use of Xen physical
+ and machine addresses (bsc#1014136, bsc#1068694).
+
+---
@@ -52,0 +79,7 @@
+- Drop SLE12-specific patches:
+ * makedumpfile-ppc64-update-hash-page-table-geometry.patch
+ * makedumpfile-Revert-Clean-up-unused-KERNEL_IMAGE_SIZE.patch
+ * makedumpfile-Revert-x86_64-kill-some-unused-init.patch
+ * makedumpfile-Revert-kill-is_vmalloc_addr_x86_64.patch
+ * makedumpfile-Revert-x86_64-translate-all-VA-to-PA-using-pgt.patch
+ * makedumpfile-Revert-Calculate-page_offset-from-pt_load.patch
@@ -65,0 +99,28 @@
+
+---
+Thu Dec 21 13:16:43 UTC 2017 - ptesa...@suse.com
+
+- makedumpfile-Revert-Clean-up-unused-KERNEL_IMAGE_SIZE.patch:
+ Revert "Clean up unused KERNEL_IMAGE_SIZE" (bsc#1068925,
+ bsc#1099121).
+- makedumpfile-Revert-x86_64-kill-some-unused-init.patch: Revert
+ "x86_64: kill some unused initialization" (bsc#1068925,
+ bsc#1099121).
+- makedumpfile-Revert-kill-is_vmalloc_addr_x86_64.patch: Revert
+ "x86_64: kill is_vmalloc_addr_x86_64()" (bsc#1068925,
+ bsc#1099121).
+- makedumpfile-Revert-x86_64-translate-all-VA-to-PA-using-pgt.patch:
+ Revert "x86_64: translate all VA to PA using page table values"
+ (bsc#1068925, bsc#1099121).
+- makedumpfile-Revert-Calculate-page_offset-from-pt_load.patch:
+ Revert "x86_64: Calculate page_offset from pt_load"
+ (bsc#1068925, bsc#1040469, bsc#1099121).
+
+---
+Mon Dec 4 17:19:48 UTC 2017 - msucha...@suse.com
+
+- makedumpfile-ppc64-update-hash-page-table-geometry.patch:
+ Kernel commit f6eedbba7a26 ("powerpc/mm/hash: Increase VA range to 128TB")
+ updated hash page table geometry. A modified version of this commit is
+ included in SLES12 SP3. Make the corresponding changes in makedumpfile tool
+ for filtering dump appropriately (bsc#1068485)
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.PdoOFY/_old 2018-09-13 12:08:37.098489287 +0200
+++ /var/tmp/diff_new_pack.PdoOFY/_new 2018-09-13 12:08:37.102489282 +0200
@@ -97,6 +97,14 @@
install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts
install -m 0644 -t %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts/
eppic_scripts/*
+%if 0%{?_defaultlicensedir:1}
+%if 0%(test ! -d %{_defaultlicensedir} && echo 1)
+%define _defaultlicensedir %_defaultdocdir
+%endif
+%else
+%define license %doc
+%endif
+
%files
%defattr(-,root,root)
%license COPYING
++ makedumpfile-rpmlintrc ++
--- /var/tmp/diff_new_pack.PdoOFY/_old 2018-09-13 12:08:37.158489220 +0200
+++ /var/tmp/diff_new_pack.PdoOFY/_new 2018-09-13 12:08:37.158489220 +0200
@@ -1 +1 @@
-addFilter("devel-file-in-non-devel-package
.*/usr/share/makedumpfile-1\.6\.1/eppic_scripts/.*\.c")
+addFilter("devel-file-in-non-devel-package
.*/usr/share/makedumpfile-1\.6\.3/eppic_scripts/.*\.c")
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2018-05-06 14:56:35
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Sun May 6 14:56:35 2018 rev:69 rq:602492 version:1.6.3
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2018-04-17 11:09:55.731765409 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2018-05-06 14:56:37.935674596 +0200
@@ -1,0 +2,8 @@
+Mon Apr 30 09:39:40 UTC 2018 - ptesa...@suse.com
+
+- makedumpfile-is_cache_page-helper.patch: Add is_cache_page()
+ helper to check if a page belongs to the cache (bsc#1088354).
+- makedumpfile-check-PG_swapbacked.patch: Check PG_swapbacked for
+ swap cache pages (bsc#1088354).
+
+---
New:
makedumpfile-check-PG_swapbacked.patch
makedumpfile-is_cache_page-helper.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.uXigAk/_old 2018-05-06 14:56:39.499617213 +0200
+++ /var/tmp/diff_new_pack.uXigAk/_new 2018-05-06 14:56:39.503617066 +0200
@@ -42,6 +42,8 @@
Patch2: %{name}-always-use-bigger-SECTION_MAP_MASK.patch
Patch3: %{name}-sadump-fix-PTI-enabled-kernels.patch
Patch4: %{name}-do-not-print-ETA-if-progress-is-0.patch
+Patch5: %{name}-is_cache_page-helper.patch
+Patch6: %{name}-check-PG_swapbacked.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
@@ -74,6 +76,8 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
%if %{have_snappy}
++ makedumpfile-check-PG_swapbacked.patch ++
From: Petr Tesarik
Date: Fri, 13 Apr 2018 17:35:55 +0200
Subject: Check PG_swapbacked for swap cache pages
References: bsc#1088354
Upstream: posted 2018-04-13
When page cache is filtered out (dump level bitmap includes 2 or 4),
makedumpfile checks the PG_swapcache bit, but since kernel commit
6326fec1122cde256bd2a8c63f2606e08e44ce1d (v4.10-rc1~7) this bit is
an alias for PG_owner_priv_1, which is also used by filesystem
code (PG_checked) and Xen (PG_pinned and PG_foreign).
With these kernels, the PG_swapcache flag is valid only if
PG_swapbacked is set. A Linux kernel patch has already been
submitted to export the value of PG_swapbacked in VMCOREINFO.
Since there are released kernels in the wild which do not export the
value, a fallback is implemented. I considered these three situations:
1. Kernels before v2.6.28-rc1~244:
PG_swapbacked does not exist, so it must not be checked.
Instead, check PG_swapcache, which is never overloaded for
another purpose.
2. Kernels between v2.6.28-rc1~244 and v4.10-rc1~7:
It is sufficient to check only PG_swapcache, but PG_swapbacked
may also be checked (it is always set if PG_swapcache is set).
3. Kernels since v4.10-rc1~7:
PG_swapbacked must be checked.
If PG_swapbacked value is known (exported or read from debuginfo),
it is always safe to use it (case 2 or 3). If PG_swapbacked is not
known, it is safe to ignore it for cases 1 and 2, but not 3.
Thankfully, the new value of PG_swapcache (since v4.10-rc1~7) is
less than PG_private (which is known), whereas the old value had
always been greater than PG_private. Moreover, the flags between
PG_private and PG_swapbacked haven't changed since v4.10-rc1~7, so
PG_swapbacked can fall back to PG_private + 6 if unknown.
Without this patch, all Xen dumps are unusable, because PG_pinned is
set for all page table pages.
Signed-off-by: Petr Tesarik
---
makedumpfile.c | 19 ++-
makedumpfile.h |2 ++
2 files changed, 20 insertions(+), 1 deletion(-)
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -252,7 +252,18 @@ isHugetlb(int dtor)
static int
is_cache_page(unsigned long flags)
{
- return isLRU(flags) || isSwapCache(flags);
+ if (isLRU(flags))
+ return TRUE;
+
+ /* PG_swapcache is valid only if:
+* a. PG_swapbacked bit is set, or
+* b. PG_swapbacked did not exist (kernels before 4.10-rc1).
+*/
+ if ((NUMBER(PG_swapbacked) == NOT_FOUND_NUMBER || isSwapBacked(flags))
+ && isSwapCache(flags))
+ return TRUE;
+
+ return FALSE;
}
static inline unsigned long
@@ -1735,6 +1746,7 @@ get_structure_info(void)
ENUM_NUMBER_INIT(PG_lru, "PG_lru");
ENUM_NUMBER_INIT(PG_private, "PG_private");
ENUM_NUMBER_INIT(PG_swapcache, "PG_swapcache");
+ ENUM_NUMBER_INIT(PG_swapbacked, "PG_swapbacked");
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2018-04-17 11:09:54
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Tue Apr 17 11:09:54 2018 rev:68 rq:594835 version:1.6.3
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2018-03-29 11:55:22.662880327 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2018-04-17 11:09:55.731765409 +0200
@@ -1,0 +2,6 @@
+Mon Apr 9 09:53:05 UTC 2018 - ptesa...@suse.com
+
+- makedumpfile-do-not-print-ETA-if-progress-is-0.patch: Do not
+ print ETA value if current progress is 0 (bsc#1084936).
+
+---
New:
makedumpfile-do-not-print-ETA-if-progress-is-0.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.WRUpeD/_old 2018-04-17 11:09:56.471730691 +0200
+++ /var/tmp/diff_new_pack.WRUpeD/_new 2018-04-17 11:09:56.471730691 +0200
@@ -41,6 +41,7 @@
Patch1: %{name}-override-libtinfo.patch
Patch2: %{name}-always-use-bigger-SECTION_MAP_MASK.patch
Patch3: %{name}-sadump-fix-PTI-enabled-kernels.patch
+Patch4: %{name}-do-not-print-ETA-if-progress-is-0.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
@@ -72,6 +73,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%if %{have_snappy}
++ makedumpfile-do-not-print-ETA-if-progress-is-0.patch ++
From: Petr Tesarik
Date: Mon, 9 Apr 2018 09:59:46 +0200
Subject: Do not print ETA value if current progress is 0
References: bsc#1084936
Upstream: submitted 2018-04-09
Essentially, the estimated remaining time is calculated as:
elapsed * (100 - progress) / progress
However, print_progress() is also called when progress is 0. The
result of a floating point division by zero is either NaN (if
elapsed is zero), or infinity (if the system clock happens to cross
a second's boundary since reading the start timestamp).
The C standard defines only conversion of floating point values
within the range of the destination integer variable. This means
that conversion of NaN or infinity to an integer is undefined
behaviour. Yes, it happens to produce INT_MIN with GCC on major
platforms...
This bug has gone unnoticed, because the very first call to
print_progress() does not specify a start timestamp (so it cannot
trigger the bug), and all subsequent calls are rate-limited to one
per second. As a result, the bug is triggered very rarely.
Before commit e5f96e79d69a1d295f19130da00ec6514d28a8ae, the bug also
caused a buffer overflow. The buffer overflow is mitigated thanks to
using snprintf() instead of sprintf(), but the program may still
invoke undefined behaviour.
Note that all other changes in the above-mentioned commit were
ineffective. They merely reduced the precision of the calculation:
Why would you add delta.tv_usec as a fraction if the fractional part
is immediately truncated by a converstion to int64_t?
Additionally, when the original bug is hit, the output is still
incorrect, e.g. on my system I get:
Copying data : [ 0.0 %] / eta:
-9223372036854775808s
For that reason, let me revert the changes from commit
e5f96e79d69a1d295f19130da00ec6514d28a8ae and fix the bug properly,
i.e. do not calculate ETA if progress is 0.
Last but not least, part of the issue was probably caused by the
wrong assumption that integers < 100 can be interpreted with max 3
ASCII characters, but that's not true for signed integers. To make
eta_to_human_short() a bit safer, use an unsigned integer type.
Signed-off-by: Petr Tesarik
---
print_info.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/print_info.c
+++ b/print_info.c
@@ -352,18 +352,18 @@ static void calc_delta(struct timeval *t
}
/* produce less than 12 bytes on msg */
-static int eta_to_human_short (int secs, char* msg)
+static int eta_to_human_short (unsigned secs, char* msg)
{
strcpy(msg, "eta: ");
msg += strlen("eta: ");
if (secs < 100)
- sprintf(msg, "%ds", secs);
+ sprintf(msg, "%us", secs);
else if (secs < 100 * 60)
- sprintf(msg, "%dm%ds", secs / 60, secs % 60);
+ sprintf(msg, "%um%us", secs / 60, secs % 60);
else if (secs < 48 * 3600)
- sprintf(msg, "%dh%dm", secs / 3600, (secs / 60) % 60);
+ sprintf(msg, "%uh%um", secs / 3600, (secs / 60) % 60);
else if (secs < 100 * 86400)
-
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2018-03-29 11:55:19
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Thu Mar 29 11:55:19 2018 rev:67 rq:591502 version:1.6.3
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2018-03-26 11:56:18.717430370 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2018-03-29 11:55:22.662880327 +0200
@@ -1,0 +2,5 @@
+Mon Mar 26 16:46:43 CEST 2018 - ku...@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
+---
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.9rlI8h/_old 2018-03-29 11:55:24.126827439 +0200
+++ /var/tmp/diff_new_pack.9rlI8h/_new 2018-03-29 11:55:24.126827439 +0200
@@ -32,7 +32,7 @@
Version:1.6.3
Release:0
Summary:Partial kernel dump
-License:GPL-2.0
+License:GPL-2.0-only
Group: System/Kernel
Url:https://sourceforge.net/projects/makedumpfile/
Source:
https://sourceforge.net/projects/makedumpfile/files/makedumpfile/%{version}/%{name}-%{version}.tar.gz
@@ -93,7 +93,8 @@
%files
%defattr(-,root,root)
-%doc README COPYING IMPLEMENTATION
+%license COPYING
+%doc README IMPLEMENTATION
%{_mandir}/man?/*
%{_bindir}/*
%dir %{_libdir}/%{name}-%{version}
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2018-03-26 11:56:17
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Mon Mar 26 11:56:17 2018 rev:66 rq:588595 version:1.6.3
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2018-01-30 15:39:27.364463901 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2018-03-26 11:56:18.717430370 +0200
@@ -1,0 +2,6 @@
+Mon Mar 19 13:16:58 UTC 2018 - ptesa...@suse.com
+
+- makedumpfile-sadump-fix-PTI-enabled-kernels.patch: sadump: Fix a
+ problem of PTI enabled kernel (bsc#1085826).
+
+---
New:
makedumpfile-sadump-fix-PTI-enabled-kernels.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.dwuuIg/_old 2018-03-26 11:56:19.781391985 +0200
+++ /var/tmp/diff_new_pack.dwuuIg/_new 2018-03-26 11:56:19.789391696 +0200
@@ -40,6 +40,7 @@
Patch0: %{name}-coptflags.diff
Patch1: %{name}-override-libtinfo.patch
Patch2: %{name}-always-use-bigger-SECTION_MAP_MASK.patch
+Patch3: %{name}-sadump-fix-PTI-enabled-kernels.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
@@ -70,6 +71,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%if %{have_snappy}
++ makedumpfile-sadump-fix-PTI-enabled-kernels.patch ++
From: Takao Indoh
Date: Fri, 26 Jan 2018 09:22:26 +0900
Subject: sadump: Fix a problem of PTI enabled kernel
References: bsc#1085826
Upstream: submitted
Message-ID: <1516926146-20347-1-git-send-email-indou.ta...@jp.fujitsu.com>
This patch fixes a problme that a dumpfile of sadump cannot be handled by
makedumpfile when Page Table Isolation(PTI) is enabled.
When PTI is enabled, bit 12 of CR3 register is used to split user space and
kernel space. Also bit 11:0 is used for Process Context IDentifiers(PCID). To
open a dump file of sadump, a value of CR3 is used to calculate KASLR offset and
phys_base, therefore this patch fixes to mask CR3 register value collectly for
PTI enabled kernel.
Signed-off-by: Takao Indoh
Acked-by: Petr Tesarik
---
makedumpfile.c |2 ++
makedumpfile.h |2 ++
sadump_info.c |9 -
3 files changed, 12 insertions(+), 1 deletion(-)
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -1572,6 +1572,8 @@ get_symbol_info(void)
SYMBOL_INIT(divide_error, "divide_error");
SYMBOL_INIT(idt_table, "idt_table");
SYMBOL_INIT(saved_command_line, "saved_command_line");
+ SYMBOL_INIT(pti_init, "pti_init");
+ SYMBOL_INIT(kaiser_init, "kaiser_init");
return TRUE;
}
--- a/makedumpfile.h
+++ b/makedumpfile.h
@@ -1606,6 +1606,8 @@ struct symbol_table {
unsigned long long divide_error;
unsigned long long idt_table;
unsigned long long saved_command_line;
+ unsigned long long pti_init;
+ unsigned long long kaiser_init;
/*
* symbols on ppc64 arch
--- a/sadump_info.c
+++ b/sadump_info.c
@@ -1362,6 +1362,9 @@ finish:
*kernel. Retrieve vmcoreinfo from address of "elfcorehdr=" and
*get kaslr_offset and phys_base from vmcoreinfo.
*/
+#define PTI_USER_PGTABLE_BIT (info->page_shift)
+#define PTI_USER_PGTABLE_MASK (1 << PTI_USER_PGTABLE_BIT)
+#define CR3_PCID_MASK 0xFFFull
int
calc_kaslr_offset(void)
{
@@ -1389,7 +1392,11 @@ calc_kaslr_offset(void)
}
idtr = ((uint64_t)smram.IdtUpper)<<32 | (uint64_t)smram.IdtLower;
- cr3 = smram.Cr3;
+ if ((SYMBOL(pti_init) != NOT_FOUND_SYMBOL) ||
+ (SYMBOL(kaiser_init) != NOT_FOUND_SYMBOL))
+ cr3 = smram.Cr3 & ~(CR3_PCID_MASK|PTI_USER_PGTABLE_MASK);
+ else
+ cr3 = smram.Cr3 & ~CR3_PCID_MASK;
/* Convert virtual address of IDT table to physical address */
if ((idtr_paddr = vtop4_x86_64_pagetable(idtr, cr3)) == NOT_PADDR)
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2018-01-30 15:39:26
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Tue Jan 30 15:39:26 2018 rev:65 rq:570629 version:1.6.3
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2018-01-16 09:32:17.369996555 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2018-01-30 15:39:27.364463901 +0100
@@ -1,0 +2,28 @@
+Mon Jan 29 14:01:03 UTC 2018 - ptesa...@suse.com
+
+- makedumpfile-always-use-bigger-SECTION_MAP_MASK.patch: Always use
+ bigger SECTION_MAP_MASK (bsc#1066811, bsc#1067703).
+
+---
+Mon Jan 29 13:49:43 UTC 2018 - ptesa...@suse.com
+
+- Update to 1.6.3
+ * Support kernels up to 4.14.8 (bsc#1068864).
+ * 86_64: handle renamed init_level4_pgt -> init_top_pgt
+ * Fix SECTION_MAP_MASK for kernel >= v.13
+ * book3s/ppc64: Lower the max real address to 53 bits for
+kernels >= v4.11
+ * Support symbol __cpu_online_mask
+ * ppc64: update hash page table geometry
+- Drop upstreamed patches:
+ * makedumpfile-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch
+ * makedumpfile-handle-renamed-init_level4_pgt-init_top_pgt.patch
+ * makedumpfile-ppc64-update-hash-page-table-geometry.patch
+ * makedumpfile-book3s-ppc64-Lower-the-max-real-address-to-53-bits.patch
+ * makedumpfile-__cpu_online_mask-symbol.patch
+ * makedumpfile-vtop4_x86_64_pagetable.patch
+ * makedumpfile-fix-KASLR-for-sadump.patch
+ * makedumpfile-fix-KASLR-for-sadump-while-kdump.patch
+ * makedumpfile-support-4.12.patch
+
+---
Old:
makedumpfile-1.6.2.tar.gz
makedumpfile-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch
makedumpfile-__cpu_online_mask-symbol.patch
makedumpfile-book3s-ppc64-Lower-the-max-real-address-to-53-bits.patch
makedumpfile-fix-KASLR-for-sadump-while-kdump.patch
makedumpfile-fix-KASLR-for-sadump.patch
makedumpfile-handle-renamed-init_level4_pgt-init_top_pgt.patch
makedumpfile-ppc64-update-hash-page-table-geometry.patch
makedumpfile-vtop4_x86_64_pagetable.patch
New:
makedumpfile-1.6.3.tar.gz
makedumpfile-always-use-bigger-SECTION_MAP_MASK.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.UvDSG1/_old 2018-01-30 15:39:27.940437011 +0100
+++ /var/tmp/diff_new_pack.UvDSG1/_new 2018-01-30 15:39:27.944436824 +0100
@@ -29,7 +29,7 @@
%endif
Name: makedumpfile
-Version:1.6.2
+Version:1.6.3
Release:0
Summary:Partial kernel dump
License:GPL-2.0
@@ -38,15 +38,8 @@
Source:
https://sourceforge.net/projects/makedumpfile/files/makedumpfile/%{version}/%{name}-%{version}.tar.gz
Source99: %{name}-rpmlintrc
Patch0: %{name}-coptflags.diff
-Patch1: %{name}-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch
-Patch2: %{name}-override-libtinfo.patch
-Patch3: %{name}-handle-renamed-init_level4_pgt-init_top_pgt.patch
-Patch4: %{name}-ppc64-update-hash-page-table-geometry.patch
-Patch5:
%{name}-book3s-ppc64-Lower-the-max-real-address-to-53-bits.patch
-Patch6: %{name}-__cpu_online_mask-symbol.patch
-Patch7: %{name}-vtop4_x86_64_pagetable.patch
-Patch8: %{name}-fix-KASLR-for-sadump.patch
-Patch9: %{name}-fix-KASLR-for-sadump-while-kdump.patch
+Patch1: %{name}-override-libtinfo.patch
+Patch2: %{name}-always-use-bigger-SECTION_MAP_MASK.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
@@ -77,13 +70,6 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
%build
%if %{have_snappy}
++ makedumpfile-1.6.2.tar.gz -> makedumpfile-1.6.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.2/Makefile
new/makedumpfile-1.6.3/Makefile
--- old/makedumpfile-1.6.2/Makefile 2017-07-26 09:49:08.0 +0200
+++ new/makedumpfile-1.6.3/Makefile 2018-01-26 02:30:25.0 +0100
@@ -1,7 +1,7 @@
# makedumpfile
-VERSION=1.6.2
-DATE=27 Jul 2017
+VERSION=1.6.3
+DATE=29 Jun 2018
# Honour the environment variable CC
ifeq ($(strip $CC),)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/makedumpfile-1.6.2/README
new/makedumpfile-1.6.3/README
--- old/makedumpfile-1.6.2/README 2017-07-26 09:49:08.0 +0200
+++ new/makedumpfile-1.6.3/README
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2018-01-16 09:32:14
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Tue Jan 16 09:32:14 2018 rev:64 rq:562835 version:1.6.2
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2017-11-24 10:53:13.731006379 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2018-01-16 09:32:17.369996555 +0100
@@ -1,0 +2,13 @@
+Tue Jan 9 09:56:06 UTC 2018 - ptesa...@suse.com
+
+- makedumpfile-__cpu_online_mask-symbol.patch: Support symbol
+ __cpu_online_mask (FATE#323473, bsc#1070291).
+- makedumpfile-vtop4_x86_64_pagetable.patch: Introduce
+ vtop4_x86_64_pagetable (FATE#323473, bsc#1070291).
+- makedumpfile-fix-KASLR-for-sadump.patch: Fix a KASLR problem of
+ sadump (FATE#323473, bsc#1070291).
+- makedumpfile-fix-KASLR-for-sadump-while-kdump.patch: sadump: Fix
+ a KASLR problem of sadump while kdump is working (FATE#323473,
+ bsc#1070291).
+
+---
New:
makedumpfile-__cpu_online_mask-symbol.patch
makedumpfile-fix-KASLR-for-sadump-while-kdump.patch
makedumpfile-fix-KASLR-for-sadump.patch
makedumpfile-vtop4_x86_64_pagetable.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.om8OOO/_old 2018-01-16 09:32:18.013966424 +0100
+++ /var/tmp/diff_new_pack.om8OOO/_new 2018-01-16 09:32:18.017966238 +0100
@@ -1,7 +1,7 @@
#
# spec file for package makedumpfile
#
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,6 +43,10 @@
Patch3: %{name}-handle-renamed-init_level4_pgt-init_top_pgt.patch
Patch4: %{name}-ppc64-update-hash-page-table-geometry.patch
Patch5:
%{name}-book3s-ppc64-Lower-the-max-real-address-to-53-bits.patch
+Patch6: %{name}-__cpu_online_mask-symbol.patch
+Patch7: %{name}-vtop4_x86_64_pagetable.patch
+Patch8: %{name}-fix-KASLR-for-sadump.patch
+Patch9: %{name}-fix-KASLR-for-sadump-while-kdump.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
@@ -76,6 +80,10 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%build
%if %{have_snappy}
++ makedumpfile-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch ++
--- /var/tmp/diff_new_pack.om8OOO/_old 2018-01-16 09:32:18.057964366 +0100
+++ /var/tmp/diff_new_pack.om8OOO/_new 2018-01-16 09:32:18.057964366 +0100
@@ -1,8 +1,9 @@
From: Pratyush Anand
Date: Thu, 17 Aug 2017 12:47:13 +0900
-Subject: [PATCH v2] Fix SECTION_MAP_MASK for kernel >= v.13
-Patch-mainline: yes
+Subject: Fix SECTION_MAP_MASK for kernel >= v.13
References: bnc#1066811, bsc#1067703
+Upstream: merged
+Git-commit: a02f5f078ce635dd1633dab70869306b0a62e2e2
* Required for kernel 4.13
* Required for SLE15 kernel due to backport of 2d070eab2e82 => 4.12
++ makedumpfile-__cpu_online_mask-symbol.patch ++
From: Takao Indoh
Date: Thu, 26 Oct 2017 20:32:48 +0900
Subject: Support symbol __cpu_online_mask
References: FATE#323473, bsc#1070291
Upstream: merged
Git-commit: d6d5b443c82471818d43cb87c9280a0252e763e7
In the upstream kernel, by commit 5aec01b83 cpu_online_mask was replaced
with macros and new variables __cpu_online_mask was added instead of it.
Sadump uses cpu_online_mask to check the cpu was online or not,
therefore it also need __cpu_online_mask symbol for this in the latest
kernel.
Signed-off-by: Takao Indoh
Signed-off-by: HATAYAMA Daisuke
Acked-by: Petr Tesarik
---
makedumpfile.c |9 +++--
makedumpfile.h |1 +
sadump_info.c |3 ++-
3 files changed, 10 insertions(+), 3 deletions(-)
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -1519,8 +1519,13 @@ get_symbol_info(void)
SYMBOL_INIT(__per_cpu_load, "__per_cpu_load");
SYMBOL_INIT(__per_cpu_offset, "__per_cpu_offset");
SYMBOL_INIT(cpu_online_mask, "cpu_online_mask");
- if (SYMBOL(cpu_online_mask) == NOT_FOUND_SYMBOL)
- SYMBOL_INIT(cpu_online_mask, "cpu_online_map");
+ SYMBOL_INIT(__cpu_online_mask, "__cpu_online_mask");
+ if (SYMBOL(cpu_online_mask) == NOT_FOUND_SYMBOL) {
+ if (SYMBOL(__cpu_online_mask) == NOT_FOUND_SYMBOL)
+
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2017-11-24 10:53:08
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Fri Nov 24 10:53:08 2017 rev:63 rq:544387 version:1.6.2
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2017-05-20 10:10:01.722695639 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2017-11-24 10:53:13.731006379 +0100
@@ -1,0 +2,30 @@
+Wed Nov 15 18:05:58 UTC 2017 - msucha...@suse.com
+
+- ppc64 Can't convert a virtual address (bsc#1067703)
+ * Added patches: makedumpfile-ppc64-update-hash-page-table-geometry.patch
+
makedumpfile-book3s-ppc64-Lower-the-max-real-address-to-53-bits.patch
+ * Refresh makedumpfile-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch to also
+apply to SLE15 (4.12 kernel) due to backport of 2d070eab2e82 (bsc#1067703)
+
+---
+Fri Nov 10 17:01:33 HKT 2017 - lzw...@suse.com
+
+- Handled renaming of init_level4_pgt to init_top_pgt (bsc#1066770).
+ * Added patch: makedumpfile-handle-renamed-init_level4_pgt-init_top_pgt.patch
+
+---
+Thu Nov 9 12:16:29 UTC 2017 - jsl...@suse.com
+
+- add makedumpfile-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch (bnc#1066811)
+
+---
+Wed Nov 8 17:00:15 HKT 2017 - lzw...@suse.com
+
+- Update to 1.6.2
+ * Fix the use of Xen physical and machine addresses (bsc#1014136)
+ * Fix memory leak in get_kcore_dump_loads()
+ * Support kernels up to 4.11.7
+ * Consider not page-size aligned phys_end for paddr_to_pfn()
+ * Add runtime kaslr offset if it exists
+
+---
Old:
makedumpfile-1.6.1.tar.gz
New:
makedumpfile-1.6.2.tar.gz
makedumpfile-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch
makedumpfile-book3s-ppc64-Lower-the-max-real-address-to-53-bits.patch
makedumpfile-handle-renamed-init_level4_pgt-init_top_pgt.patch
makedumpfile-ppc64-update-hash-page-table-geometry.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.aogvod/_old 2017-11-24 10:53:14.926962692 +0100
+++ /var/tmp/diff_new_pack.aogvod/_new 2017-11-24 10:53:14.930962547 +0100
@@ -1,7 +1,7 @@
#
# spec file for package makedumpfile
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
%endif
Name: makedumpfile
-Version:1.6.1
+Version:1.6.2
Release:0
Summary:Partial kernel dump
License:GPL-2.0
@@ -38,7 +38,11 @@
Source:
https://sourceforge.net/projects/makedumpfile/files/makedumpfile/%{version}/%{name}-%{version}.tar.gz
Source99: %{name}-rpmlintrc
Patch0: %{name}-coptflags.diff
+Patch1: %{name}-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch
Patch2: %{name}-override-libtinfo.patch
+Patch3: %{name}-handle-renamed-init_level4_pgt-init_top_pgt.patch
+Patch4: %{name}-ppc64-update-hash-page-table-geometry.patch
+Patch5:
%{name}-book3s-ppc64-Lower-the-max-real-address-to-53-bits.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
@@ -67,7 +71,11 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
%if %{have_snappy}
++ makedumpfile-1.6.1.tar.gz -> makedumpfile-1.6.2.tar.gz ++
4051 lines of diff (skipped)
++ makedumpfile-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch ++
From: Pratyush Anand
Date: Thu, 17 Aug 2017 12:47:13 +0900
Subject: [PATCH v2] Fix SECTION_MAP_MASK for kernel >= v.13
Patch-mainline: yes
References: bnc#1066811, bsc#1067703
* Required for kernel 4.13
* Required for SLE15 kernel due to backport of 2d070eab2e82 => 4.12
commit 2d070eab2e82 "mm: consider zone which is not fully populated to
have holes" added a new flag SECTION_IS_ONLINE and therefore
SECTION_MAP_MASK has been changed. We are not able to find correct
mem_map in makedumpfile for kernel version v4.13-rc1 and onward because
of the above kernel change.
This patch fixes the MASK value keeping the code backward compatible
Signed-off-by: Pratyush Anand
Signed-off-by: Jiri Slaby
---
makedumpfile.c
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2017-05-20 10:09:59
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Sat May 20 10:09:59 2017 rev:62 rq:495010 version:1.6.1
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2016-07-24 19:43:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2017-05-20 10:10:01.722695639 +0200
@@ -1,0 +2,12 @@
+Thu May 11 15:32:13 UTC 2017 - ptesa...@suse.com
+
+- Update to 1.6.1 (FATE#322011).
+ * Enhance support for aarch64
+ * Enhance support for ppc64
+ * Support kernels up to 4.8
+- Drop upstreamed patch
+ * makedumpfile-_count-_refcount-rename.patch
+- Merge with updates on SLE12 SP2 (FATE#318012, bsc#992885,
+ bsc#999869).
+
+---
@@ -24 +36 @@
-- Update to 1.6.0
+- Update to 1.6.0 (FATE#320955).
@@ -48 +60 @@
- * support for aarch64
+ * support for aarch64 (FATE#318444)
@@ -49,0 +62 @@
+ * Enable compressed dump formats for Xen (FATE#316467).
@@ -117 +130 @@
- o ability to filter Xen Dom0 dumps
+ o ability to filter Xen Dom0 dumps (bnc#864910, bnc#829646).
@@ -125 +138 @@
-- enable snappy compression
+- enable snappy compression (FATE#315726).
@@ -321,2 +334,2 @@
- o Fix a typo in README file.
- o Code Cleanup
+ o Fix a typo in README file.
+ o Code Cleanup
Old:
makedumpfile-1.6.0.tar.gz
makedumpfile-_count-_refcount-rename.patch
New:
makedumpfile-1.6.1.tar.gz
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.SBBh2M/_old 2017-05-20 10:10:02.486587703 +0200
+++ /var/tmp/diff_new_pack.SBBh2M/_new 2017-05-20 10:10:02.490587138 +0200
@@ -1,7 +1,7 @@
#
# spec file for package makedumpfile
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
%endif
Name: makedumpfile
-Version:1.6.0
+Version:1.6.1
Release:0
Summary:Partial kernel dump
License:GPL-2.0
@@ -38,7 +38,6 @@
Source:
https://sourceforge.net/projects/makedumpfile/files/makedumpfile/%{version}/%{name}-%{version}.tar.gz
Source99: %{name}-rpmlintrc
Patch0: %{name}-coptflags.diff
-Patch1: %{name}-_count-_refcount-rename.patch
Patch2: %{name}-override-libtinfo.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
@@ -68,7 +67,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%build
++ makedumpfile-1.6.0.tar.gz -> makedumpfile-1.6.1.tar.gz ++
1939 lines of diff (skipped)
++ makedumpfile-rpmlintrc ++
--- /var/tmp/diff_new_pack.SBBh2M/_old 2017-05-20 10:10:02.606570750 +0200
+++ /var/tmp/diff_new_pack.SBBh2M/_new 2017-05-20 10:10:02.610570185 +0200
@@ -1 +1 @@
-addFilter("devel-file-in-non-devel-package
.*/usr/share/makedumpfile-1\.6\.0/eppic_scripts/.*\.c")
+addFilter("devel-file-in-non-devel-package
.*/usr/share/makedumpfile-1\.6\.1/eppic_scripts/.*\.c")
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2016-07-24 19:43:17
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2016-04-07 13:35:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2016-07-24 19:43:18.0 +0200
@@ -1,0 +2,43 @@
+Tue Jul 12 15:56:04 UTC 2016 - ptesa...@suse.com
+
+- Rename Support-_count-_refcount-rename-in-struct-p.patch to
+ makedumpfile-_count-_refcount-rename.patch.
+
+---
+Tue Jul 12 12:16:40 UTC 2016 - ptesa...@suse.com
+
+- Silence rpmlint errors about devel files in non-devel package;
+ despite their .c suffix, the provided eppic scripts are intended
+ for production, not development.
+
+---
+Tue Jul 12 10:08:41 UTC 2016 - ptesa...@suse.com
+
+- Build and install the eppic extension.
+- makedumpfile-override-libtinfo.patch: Allow to override the tinfo
+ library used for eppic.
+
+---
+Tue Jul 12 09:13:25 UTC 2016 - ptesa...@suse.com
+
+- Update to 1.6.0
+ * Exclude page structures of non-dumped pages.
+- Drop upstreamed patch
+ * Looking-for-page.compound_order-compound_dtor-.patch
+ * Skip-examining-compound-tail-pages.patch
+
+---
+Fri Jul 8 08:50:40 UTC 2016 - mkube...@suse.cz
+
+- Looking-for-page.compound_order-compound_dtor-.patch:
+ fix excluding hugepages (kernel 4.4 compatibility)
+- Skip-examining-compound-tail-pages.patch
+ fix excluding compound tail pages (kernel 4.5 compatibility)
+
+---
+Fri Jul 8 05:57:04 UTC 2016 - mkube...@suse.cz
+
+- Support-_count-_refcount-rename-in-struct-p.patch:
+ support 4.7 kernel (page._count renamed to page._refcount)
+
+---
Old:
makedumpfile-1.5.9.tar.gz
New:
makedumpfile-1.6.0.tar.gz
makedumpfile-_count-_refcount-rename.patch
makedumpfile-override-libtinfo.patch
makedumpfile-rpmlintrc
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.aaaetu/_old 2016-07-24 19:43:19.0 +0200
+++ /var/tmp/diff_new_pack.aaaetu/_new 2016-07-24 19:43:19.0 +0200
@@ -23,23 +23,33 @@
%define have_snappy 0
%endif
%endif
+
+%if 0%{?suse_version} < 1310 && 0%{?sles_version} < 12
+%define ncurses_make_opts TINFOLIB=-lncurses
+%endif
+
Name: makedumpfile
-Version:1.5.9
+Version:1.6.0
Release:0
Summary:Partial kernel dump
License:GPL-2.0
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}-_count-_refcount-rename.patch
+Patch2: %{name}-override-libtinfo.patch
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
+BuildRequires: libeppic-devel
BuildRequires: lzo-devel
+BuildRequires: ncurses-devel
BuildRequires: xz-devel
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm aarch64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 ppc64le s390x %{arm} aarch64
%if 0%{?suse_version} >= 1140 || 0%{?sles_version} >= 11
BuildRequires: libbz2-devel
%else
@@ -58,18 +68,24 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
%if %{have_snappy}
export USESNAPPY=on
%endif
-make %{?_smp_mflags} COPTFLAGS="%{optflags}" USELZO=on LINKTYPE=dynamic
+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}
%install
install -D -m 0755 makedumpfile %{buildroot}%{_bindir}/makedumpfile
install -D -m 0755 makedumpfile-R.pl %{buildroot}%{_bindir}/makedumpfile-R.pl
install -D -m 0644 makedumpfile.8 %{buildroot}%{_mandir}/man8/makedumpfile.8
install -D -m 0644 makedumpfile.conf.5
%{buildroot}%{_mandir}/man5/makedumpfile.conf.5
+install -D -m 0755 eppic_makedumpfile.so
%{buildroot}%{_libdir}/%{name}-%{version}/eppic_makedumpfile.so
install -d -m 0755
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2016-04-07 13:35:23
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is "makedumpfile"
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2015-07-16 17:16:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2016-04-07 13:35:31.0 +0200
@@ -1,0 +2,12 @@
+Sun Feb 14 08:11:59 UTC 2016 - mplus...@suse.com
+
+- Update to 1.5.9
+ * support for aarch64
+ * Support kernels up to 4.1
+- Drop upstreamed patch
+ * makedumpfile-add-aarch64.diff
+- Use url for source
+- Cleanup spec file with spec-cleaner
+- Adjust usage of install (-c is ignored)
+
+---
Old:
makedumpfile-1.5.8.tar.bz2
makedumpfile-add-aarch64.diff
New:
makedumpfile-1.5.9.tar.gz
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.MIyxZR/_old 2016-04-07 13:35:31.0 +0200
+++ /var/tmp/diff_new_pack.MIyxZR/_new 2016-04-07 13:35:31.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package makedumpfile
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,33 +23,31 @@
%define have_snappy 0
%endif
%endif
-
Name: makedumpfile
+Version:1.5.9
+Release:0
+Summary:Partial kernel dump
+License:GPL-2.0
+Group: System/Kernel
+Url:https://sourceforge.net/projects/makedumpfile/
+Source:
https://sourceforge.net/projects/makedumpfile/files/makedumpfile/%{version}/%{name}-%{version}.tar.gz
+Patch0: %{name}-coptflags.diff
BuildRequires: libdw-devel
BuildRequires: libebl-devel
BuildRequires: libelf-devel
+BuildRequires: lzo-devel
+BuildRequires: xz-devel
BuildRequires: zlib-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm aarch64
%if 0%{?suse_version} >= 1140 || 0%{?sles_version} >= 11
BuildRequires: libbz2-devel
%else
BuildRequires: bzip2
%endif
-BuildRequires: lzo-devel
%if %{have_snappy}
BuildRequires: snappy-devel
%endif
-BuildRequires: xz-devel
-Version:1.5.8
-Release:0
-Summary:Partial kernel dump
-License:GPL-2.0
-Group: System/Kernel
-Url:https://sourceforge.net/projects/makedumpfile/
-Source: %{name}-%{version}.tar.bz2
-Patch0: %{name}-coptflags.diff
-Patch1: %{name}-add-aarch64.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm aarch64
%description
makedumpfile is a dump program to shorten the size of dump file. It
@@ -57,41 +55,28 @@
and can compress the page data. The obtained dump file can by analyzed
via gdb or crash utility.
-
-
-Authors:
-
-NEC Corporation
-
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%if %{have_snappy}
export USESNAPPY=on
%endif
-make COPTFLAGS="$RPM_OPT_FLAGS" USELZO=on LINKTYPE=dynamic
+make %{?_smp_mflags} COPTFLAGS="%{optflags}" USELZO=on LINKTYPE=dynamic
%install
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -c -m 0755 makedumpfile $RPM_BUILD_ROOT%{_bindir}
-install -c -m 0755 makedumpfile-R.pl $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
-install -c -m 0644 makedumpfile.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install -c -m 0644 makedumpfile.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/eppic_scripts
-install -c -m 644 -t
$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/eppic_scripts/ eppic_scripts/*
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+install -D -m 0755 makedumpfile %{buildroot}%{_bindir}/makedumpfile
+install -D -m 0755 makedumpfile-R.pl %{buildroot}%{_bindir}/makedumpfile-R.pl
+install -D -m 0644 makedumpfile.8 %{buildroot}%{_mandir}/man8/makedumpfile.8
+install -D -m 0644 makedumpfile.conf.5
%{buildroot}%{_mandir}/man5/makedumpfile.conf.5
+install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts
+install -m 0644 -t %{buildroot}%{_datadir}/%{name}-%{version}/eppic_scripts/
eppic_scripts/*
%files
%defattr(-,root,root)
%doc README COPYING IMPLEMENTATION
-%doc %{_mandir}/man?/*
+%{_mandir}/man?/*
%{_bindir}/*
%dir %{_datadir}/%{name}-%{version}
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2015-07-16 17:16:02
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2015-03-30 19:31:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2015-07-16 17:16:03.0 +0200
@@ -1,0 +2,6 @@
+Thu Jul 10 10:47:12 UTC 2015 - mbrug...@suse.com
+
+- makedumpfile-add-aarch64.diff: Add support for aarch64
+ This patch should be oboslet when switching to 1.5.9
+
+---
New:
makedumpfile-add-aarch64.diff
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.Z38NUC/_old 2015-07-16 17:16:04.0 +0200
+++ /var/tmp/diff_new_pack.Z38NUC/_new 2015-07-16 17:16:04.0 +0200
@@ -47,8 +47,9 @@
Url:https://sourceforge.net/projects/makedumpfile/
Source: %{name}-%{version}.tar.bz2
Patch0: %{name}-coptflags.diff
+Patch1: %{name}-add-aarch64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm
+ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm aarch64
%description
makedumpfile is a dump program to shorten the size of dump file. It
@@ -65,6 +66,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%if %{have_snappy}
++ makedumpfile-add-aarch64.diff ++
--- a/Makefile
+++ b/Makefile
@@ -49,6 +49,7 @@ SRC_BASE = makedumpfile.c makedumpfile.h
SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c
cache.c
OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c
arch/s390x.c arch/ppc.c
+SRC_ARCH = arch/arm.c arch/arm64.c arch/x86.c arch/x86_64.c arch/ia64.c
arch/ppc64.c arch/s390x.c arch/ppc.c
OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
--- /dev/null
+++ b/arch/arm64.c
@@ -0,0 +1,322 @@
+/*
+ * arch/arm64.c : Based on arch/arm.c
+ *
+ * Copyright (C) 2015 Red Hat, Pratyush Anand pan...@redhat.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation (version 2 of the License).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifdef __aarch64__
+
+#include ../elf_info.h
+#include ../makedumpfile.h
+#include ../print_info.h
+
+typedef struct {
+ unsigned long pgd;
+} pgd_t;
+
+typedef struct {
+ pgd_t pgd;
+} pud_t;
+
+typedef struct {
+ pud_t pud;
+} pmd_t;
+
+#define pud_offset(pgd, vaddr) ((pud_t *)pgd)
+#define pmd_offset(pud, vaddr) ((pmd_t *)pud)
+#define pgd_val(x) ((x).pgd)
+#define pud_val(x) (pgd_val((x).pgd))
+#define pmd_val(x) (pud_val((x).pud))
+
+#define PUD_SHIFT PGDIR_SHIFT
+#define PUD_SIZE (1UL PUD_SHIFT)
+
+typedef struct {
+ unsigned long pte;
+} pte_t;
+#define pte_val(x) ((x).pte)
+
+#define PAGE_SIZE (1UL PAGE_SHIFT)
+#define PAGE_MASK (~(PAGE_SIZE - 1))
+#define PGDIR_SHIFT((PAGE_SHIFT - 3) * ARM64_PGTABLE_LEVELS + 3)
+#define PTRS_PER_PGD (1 (VA_BITS - PGDIR_SHIFT))
+#define PMD_SHIFT ((PAGE_SHIFT - 3) * 2 + 3)
+#define PTRS_PER_PTE (1 (PAGE_SHIFT - 3))
+#define PMD_SHIFT ((PAGE_SHIFT - 3) * 2 + 3)
+#define PMD_SIZE (1UL PMD_SHIFT)
+#define PMD_MASK (~(PMD_SIZE - 1))
+#define PTRS_PER_PMD PTRS_PER_PTE
+
+#define PAGE_PRESENT (1 0)
+#define SECTIONS_SIZE_BITS 30
+/*
+
+* Highest possible physical address supported.
+*/
+#define PHYS_MASK_SHIFT48
+#define PHYS_MASK ((1UL PHYS_MASK_SHIFT) - 1)
+
+#define PMD_TYPE_MASK 3
+#define PMD_TYPE_SECT 1
+#define PMD_TYPE_TABLE 3
+
+#define __va(paddr)((paddr) - info-phys_base +
PAGE_OFFSET)
+#define __pa(vaddr)((vaddr) - PAGE_OFFSET +
info-phys_base)
+
+#define
commit makedumpfile for openSUSE:Factory
Hello community, here is the log from the commit of package makedumpfile for openSUSE:Factory checked in at 2015-03-30 19:31:45 Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old) and /work/SRC/openSUSE:Factory/.makedumpfile.new (New) Package is makedumpfile Changes: --- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes 2014-09-25 09:33:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes 2015-03-30 19:31:46.0 +0200 @@ -1,0 +2,8 @@ +Wed Mar 25 08:00:03 UTC 2015 - ptesa...@suse.cz + +- upgrade to makedumpfile-1.5.8 + o Fair I/O workload assignment for --split + o Make incomplete dumpfile readable + o Support kernels up to 3.19 + +--- Old: makedumpfile-1.5.7.tar.bz2 New: makedumpfile-1.5.8.tar.bz2 Other differences: -- ++ makedumpfile.spec ++ --- /var/tmp/diff_new_pack.9xOeY6/_old 2015-03-30 19:31:46.0 +0200 +++ /var/tmp/diff_new_pack.9xOeY6/_new 2015-03-30 19:31:46.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package makedumpfile # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,7 +39,7 @@ BuildRequires: snappy-devel %endif BuildRequires: xz-devel -Version:1.5.7 +Version:1.5.8 Release:0 Summary:Partial kernel dump License:GPL-2.0 ++ makedumpfile-1.5.7.tar.bz2 - makedumpfile-1.5.8.tar.bz2 ++ 1954 lines of diff (skipped)
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2014-09-25 09:33:38
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2014-06-19 13:08:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2014-09-25 09:33:40.0 +0200
@@ -1,0 +2,22 @@
+Tue Sep 23 16:54:05 UTC 2014 - ptesa...@suse.cz
+
+- Switch to dynamic linking: Since most libraries are no longer
+ available for static link, the remaining space savings are
+ no longer worth the effort.
+
+---
+Tue Sep 23 16:40:58 UTC 2014 - ptesa...@suse.cz
+
+- upgrade to makedumpfile-1.5.7
+ o Show memory usage of the running kernel
+ o Hugepage filtering
+ o Support kernels up to 3.16
+
+- Drop following patches, which are now upstream:
+ o makedumpfile-generic-multi-page-excl.patch
+ o makedumpfile-remove-overrun-adj.patch
+ o makedumpfile-fix-free-bitmap_buffer_cyclic.patch
+ o makedumpfile-isCompoundHead.patch
+ o makedumpfile-exclude-compound-pages.patch
+
+---
Old:
README.static
makedumpfile-1.5.6.tar.bz2
makedumpfile-exclude-compound-pages.patch
makedumpfile-fix-free-bitmap_buffer_cyclic.patch
makedumpfile-generic-multi-page-excl.patch
makedumpfile-isCompoundHead.patch
makedumpfile-remove-overrun-adj.patch
New:
makedumpfile-1.5.7.tar.bz2
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.BhZhkM/_old 2014-09-25 09:33:41.0 +0200
+++ /var/tmp/diff_new_pack.BhZhkM/_new 2014-09-25 09:33:41.0 +0200
@@ -39,20 +39,14 @@
BuildRequires: snappy-devel
%endif
BuildRequires: xz-devel
-Version:1.5.6
+Version:1.5.7
Release:0
Summary:Partial kernel dump
License:GPL-2.0
Group: System/Kernel
Url:https://sourceforge.net/projects/makedumpfile/
Source: %{name}-%{version}.tar.bz2
-Source1:README.static
Patch0: %{name}-coptflags.diff
-Patch1: %{name}-generic-multi-page-excl.patch
-Patch2: %{name}-remove-overrun-adj.patch
-Patch3: %{name}-isCompoundHead.patch
-Patch4: %{name}-exclude-compound-pages.patch
-Patch5: %{name}-fix-free-bitmap_buffer_cyclic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm
@@ -71,39 +65,17 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
-LIBS_STATIC=
-LIBS_DYNAMIC=
-if nm -u -f posix %{_libdir}/libdw.a | grep '^BZ2_bzDecompress U'; then
- if [ -e %{_libdir}/libbz2.a ]; then
-LIBS_STATIC=$LIBS_STATIC -lbz2
- else
-LIBS_DYNAMIC=$LIBS_DYNAMIC -lbz2
- fi
-fi
-if nm -u -f posix %{_libdir}/libdw.a | grep '^lzma_code U'; then
- if [ -e %{_libdir}/liblzma.a ]; then
-LIBS_STATIC=$LIBS_STATIC -llzma
- else
-LIBS_DYNAMIC=$LIBS_DYNAMIC -llzma
- fi
-fi
-export LIBS_STATIC LIBS_DYNAMIC
%if %{have_snappy}
export USESNAPPY=on
%endif
-make COPTFLAGS=$RPM_OPT_FLAGS USELZO=on
+make COPTFLAGS=$RPM_OPT_FLAGS USELZO=on LINKTYPE=dynamic
%install
-mkdir -p $RPM_BUILD_ROOT/bin
-install -c -m 0755 makedumpfile $RPM_BUILD_ROOT/bin
-install -c -m 0755 makedumpfile-R.pl $RPM_BUILD_ROOT/bin
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -c -m 0755 makedumpfile $RPM_BUILD_ROOT%{_bindir}
+install -c -m 0755 makedumpfile-R.pl $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
install -c -m 0644 makedumpfile.8 $RPM_BUILD_ROOT%{_mandir}/man8
@@ -118,7 +90,7 @@
%defattr(-,root,root)
%doc README COPYING IMPLEMENTATION
%doc %{_mandir}/man?/*
-/bin/*
+%{_bindir}/*
%dir %{_datadir}/%{name}-%{version}
%{_datadir}/%{name}-%{version}/eppic_scripts/
++ makedumpfile-1.5.6.tar.bz2 - makedumpfile-1.5.7.tar.bz2 ++
2738 lines of diff (skipped)
++ makedumpfile-coptflags.diff ++
--- /var/tmp/diff_new_pack.BhZhkM/_old 2014-09-25 09:33:41.0 +0200
+++ /var/tmp/diff_new_pack.BhZhkM/_new 2014-09-25 09:33:41.0 +0200
@@ -17,15 +17,3 @@
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
# LDFLAGS = -L/usr/local/lib -I/usr/local/include
-@@ -51,9 +51,9 @@ OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART))
- SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c
arch/s390x.c arch/ppc.c
- OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH))
-
--LIBS = -ldw -lbz2 -lebl -ldl -lelf
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2014-06-19 13:08:27
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2014-05-10 08:32:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2014-06-19 13:08:28.0 +0200
@@ -1,0 +2,18 @@
+Mon Jun 16 07:49:20 UTC 2014 - ptesa...@suse.cz
+
+- makedumpfile-fix-free-bitmap_buffer_cyclic.patch: Fix free
+ bitmap_buffer_cyclic error.
+
+---
+Fri Jun 13 10:00:24 UTC 2014 - ptesa...@suse.cz
+
+- makedumpfile-generic-multi-page-excl.patch: Generic handling of
+ multi-page exclusions (bnc#873232).
+- makedumpfile-remove-overrun-adj.patch: Get rid of overrun
+ adjustments (bnc#873232).
+- makedumpfile-isCompoundHead.patch: Add isCompoundHead() macro to
+ check for compound pages (bnc#873232).
+- makedumpfile-exclude-compound-pages.patch: Treat compound pages
+ as a single entity (bnc#873232).
+
+---
New:
makedumpfile-exclude-compound-pages.patch
makedumpfile-fix-free-bitmap_buffer_cyclic.patch
makedumpfile-generic-multi-page-excl.patch
makedumpfile-isCompoundHead.patch
makedumpfile-remove-overrun-adj.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.FFrk8i/_old 2014-06-19 13:08:29.0 +0200
+++ /var/tmp/diff_new_pack.FFrk8i/_new 2014-06-19 13:08:29.0 +0200
@@ -48,6 +48,11 @@
Source: %{name}-%{version}.tar.bz2
Source1:README.static
Patch0: %{name}-coptflags.diff
+Patch1: %{name}-generic-multi-page-excl.patch
+Patch2: %{name}-remove-overrun-adj.patch
+Patch3: %{name}-isCompoundHead.patch
+Patch4: %{name}-exclude-compound-pages.patch
+Patch5: %{name}-fix-free-bitmap_buffer_cyclic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm
@@ -66,6 +71,11 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
LIBS_STATIC=
++ makedumpfile-exclude-compound-pages.patch ++
From: Petr Tesarik ptesa...@suse.cz
Date: Fri Jun 13 11:57:03 2014 +0200
Subject: Treat compound pages as a single entity
References: bnc#873232
Patch-mainline: not yet
For a compound page, the head page determines whether the page should be
kept or excluded.
Signed-off-by: Petr Tesarik ptesa...@suse.cz
---
makedumpfile.c | 57 +++--
1 file changed, 43 insertions(+), 14 deletions(-)
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -4652,6 +4652,7 @@ __exclude_unnecessary_pages(unsigned lon
unsigned char *pcache;
unsigned int _count, _mapcount = 0;
unsigned long flags, mapping, private = 0;
+ int nr_pages;
/*
* If a multi-page exclusion is pending, do it first
@@ -4671,7 +4672,13 @@ __exclude_unnecessary_pages(unsigned lon
pfn_read_start = ULONGLONG_MAX;
pfn_read_end = 0;
- for (pfn = pfn_start; pfn pfn_end; pfn++, mem_map += SIZE(page)) {
+ for (pfn = pfn_start; pfn pfn_end; pfn += nr_pages, mem_map +=
nr_pages * SIZE(page)) {
+ unsigned long long *pfn_counter;
+
+ /*
+* Process one page by default.
+*/
+ nr_pages = 1;
/*
* If this pfn doesn't belong to target region, skip this pfn.
@@ -4723,18 +4730,32 @@ __exclude_unnecessary_pages(unsigned lon
private = ULONG(pcache + OFFSET(page.private));
/*
+* Check for compound pages.
+*/
+ if (isCompoundHead(flags) (pfn + 1 = pfn_read_end)) {
+ unsigned char *ptail;
+ unsigned long order;
+
+ ptail = pcache + SIZE(page);
+ order = ULONG(ptail + OFFSET(page.lru) +
+ OFFSET(list_head.prev));
+ if (order order sizeof(unsigned long) * 8
+ (pfn ((1UL order) - 1)) == 0
+ (OFFSET(page.private) == NOT_FOUND_STRUCTURE ||
+ULONG(ptail + OFFSET(page.private)) == mem_map)) {
+ nr_pages = 1UL order;
+ }
+ }
+
+ /*
*
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2014-03-23 22:29:52
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2014-02-26 06:58:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2014-03-23 22:29:53.0 +0100
@@ -1,0 +2,5 @@
+Fri Mar 21 09:50:53 UTC 2014 - ptesa...@suse.cz
+
+- enable snappy compression
+
+---
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.UXASL1/_old 2014-03-23 22:29:53.0 +0100
+++ /var/tmp/diff_new_pack.UXASL1/_new 2014-03-23 22:29:53.0 +0100
@@ -16,6 +16,14 @@
#
+%if 0%{!?have_snappy:1}
+%if 0%{?suse_version} = 1310
+%define have_snappy 1
+%else
+%define have_snappy 0
+%endif
+%endif
+
Name: makedumpfile
BuildRequires: libdw-devel
BuildRequires: libebl-devel
@@ -26,8 +34,11 @@
%else
BuildRequires: bzip2
%endif
-BuildRequires: lzma-devel
BuildRequires: lzo-devel
+%if %{have_snappy}
+BuildRequires: snappy-devel
+%endif
+BuildRequires: xz-devel
Version:1.5.5
Release:0
Summary:Partial kernel dump
@@ -78,6 +89,9 @@
fi
fi
export LIBS_STATIC LIBS_DYNAMIC
+%if %{have_snappy}
+export USESNAPPY=on
+%endif
make COPTFLAGS=$RPM_OPT_FLAGS USELZO=on
%install
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2014-02-26 06:58:45
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2014-02-18 14:45:11.0 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2014-02-26 06:58:46.0 +0100
@@ -1,0 +2,8 @@
+Tue Feb 25 11:53:37 UTC 2014 - ptesa...@suse.cz
+
+- makedumpfile-fix-sprintf-append.patch: Fix string append in
+ dump_log_entry() (bnc#865596).
+- makedumpfile-kernel-3.12-supported.patch: Mark kernel 3.12 as
+ supported.
+
+---
New:
makedumpfile-fix-sprintf-append.patch
makedumpfile-kernel-3.12-supported.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.9UiGNr/_old 2014-02-26 06:58:46.0 +0100
+++ /var/tmp/diff_new_pack.9UiGNr/_new 2014-02-26 06:58:46.0 +0100
@@ -37,6 +37,8 @@
Source: %{name}-%{version}.tar.bz2
Source1:README.static
Patch0: %{name}-coptflags.diff
+Patch1: %{name}-fix-sprintf-append.patch
+Patch2: %{name}-kernel-3.12-supported.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm
@@ -55,6 +57,8 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
LIBS_STATIC=
++ makedumpfile-fix-sprintf-append.patch ++
From: Petr Tesarik ptesa...@suse.cz
Subject: Fix string append in dump_log_entry()
References: bnc#865596
Patch-mainline: not yet
To quote the sprintf(3) man page:
Some programs imprudently rely on code such as the following
sprintf(buf, %s some further text, buf);
to append text to buf. However, the standards explicitly note that
the results are undefined if source and destination buffers overlap
when calling sprintf(), snprintf(), vsprintf(), and vsnprintf().
Depending on the version of gcc(1) used, and the compiler options
employed, calls such as the above will not produce the expected results.
It's also overkill to call sprintf() for something that can be done
with a simple assignment.
Signed-off-by: Petr Tesarik ptesa...@suse.cz
---
makedumpfile.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -3830,7 +3830,7 @@ reset_bitmap_of_free_pages(unsigned long
static int
dump_log_entry(char *logptr, int fp)
{
- char *msg, *p;
+ char *msg, *p, *bufp;
unsigned int i, text_len;
unsigned long long ts_nsec;
char buf[BUFSIZE];
@@ -3845,20 +3845,21 @@ dump_log_entry(char *logptr, int fp)
msg = logptr + SIZE(printk_log);
- sprintf(buf, [%5lld.%06ld] , nanos, rem/1000);
+ bufp = buf;
+ bufp += sprintf(buf, [%5lld.%06ld] , nanos, rem/1000);
for (i = 0, p = msg; i text_len; i++, p++) {
if (*p == '\n')
- sprintf(buf, %s., buf);
+ *bufp++ = '.';
else if (isprint(*p) || isspace(*p))
- sprintf(buf, %s%c, buf, *p);
+ *bufp++ = *p;
else
- sprintf(buf, %s., buf);
+ *bufp++ = '.';
}
- sprintf(buf, %s\n, buf);
+ *bufp++ = '\n';
- if (write(info-fd_dumpfile, buf, strlen(buf)) 0)
+ if (write(info-fd_dumpfile, buf, bufp - buf) 0)
return FALSE;
else
return TRUE;
++ makedumpfile-kernel-3.12-supported.patch ++
From: Petr Tesarik ptesa...@suse.cz
Subject: Mark kernel 3.12 as supported
Patch-mainline: not yet
Signed-off-by: Petr Tesarik ptesa...@suse.cz
---
makedumpfile.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/makedumpfile.h
+++ b/makedumpfile.h
@@ -434,7 +434,7 @@ do { \
#define KVER_MIN_SHIFT 16
#define KERNEL_VERSION(x,y,z) (((x) KVER_MAJ_SHIFT) | ((y)
KVER_MIN_SHIFT) | (z))
#define OLDEST_VERSION KERNEL_VERSION(2, 6, 15)/* linux-2.6.15 */
-#define LATEST_VERSION KERNEL_VERSION(3, 11, 3)/* linux-3.11.3 */
+#define LATEST_VERSION KERNEL_VERSION(3, 12, 0x)/* linux-3.12.x */
/*
* vmcoreinfo in /proc/vmcore
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2013-12-11 15:41:30
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2013-12-05 21:40:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2013-12-11 15:41:31.0 +0100
@@ -1,0 +2,5 @@
+Tue Dec 10 19:05:06 UTC 2013 - dval...@suse.com
+
+- enable ppc64le
+
+---
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.BgDEVP/_old 2013-12-11 15:41:31.0 +0100
+++ /var/tmp/diff_new_pack.BgDEVP/_new 2013-12-11 15:41:31.0 +0100
@@ -40,7 +40,7 @@
Patch1: %{name}-powerpc.patch
Patch2: %{name}-raise-44bit-physaddr-limit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 s390x %arm
+ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 ppc64le s390x %arm
%description
makedumpfile is a dump program to shorten the size of dump file. It
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2013-12-05 21:40:05
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2013-09-13 14:46:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2013-12-05 21:40:08.0 +0100
@@ -1,0 +2,6 @@
+Wed Dec 4 14:45:41 UTC 2013 - ptesa...@suse.cz
+
+- makedumpfile-raise-44bit-physaddr-limit.patch: Fix max_mapnr
+ issue on system has over 44-bit addressing (bnc#841145).
+
+---
New:
makedumpfile-raise-44bit-physaddr-limit.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.TBVqAN/_old 2013-12-05 21:40:08.0 +0100
+++ /var/tmp/diff_new_pack.TBVqAN/_new 2013-12-05 21:40:08.0 +0100
@@ -38,6 +38,7 @@
Source1:README.static
Patch0: %{name}-coptflags.diff
Patch1: %{name}-powerpc.patch
+Patch2: %{name}-raise-44bit-physaddr-limit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 s390x %arm
@@ -57,6 +58,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
LIBS_STATIC=
++ makedumpfile-raise-44bit-physaddr-limit.patch ++
From: Jingbai Ma jingbai...@hp.com
Subject: Fix max_mapnr issue on system has over 44-bit addressing
Date: Fri Oct 18 18:53:38 2013 +0900
References: bnc#841145
Git-commit: 8e124174b62376b17ac909bc68622ef07bde6840
Patch-mainline: planned for 1.5.5
[PATCH v4] Fix max_mapnr issue on system has over 44-bit addressing.
This patch will fix a bug of makedumpfile doesn't work correctly on system
has over 44-bit addressing in compression dump mode.
This bug was posted here:
http://lists.infradead.org/pipermail/kexec/2013-September/009587.html
This patch will add 3 new fields in struct kdump_sub_header.
unsigned long long start_pfn_64; /* header_version 6 and later */
unsigned long long end_pfn_64;/* header_version 6 and later */
unsigned long long max_mapnr_64; /* header_version 6 and later */
And the old unsigned int max_mapnr in struct disk_dump_header will
not be used anymore, but still be there for compatibility purpose.
The max_mapnr_64 only exists in strcut kdump_sub_header, and that only
for compressed kdump format, so for ELF format kdump files (non-compressed),
only the max_mapnr is available, so it still may be truncated for addresses
exceed 44bit (above 16TB).
This patch will change the header_version to 6.
The corresponding patch for crash utility can be found here:
http://lists.infradead.org/pipermail/kexec/2013-October/009750.html
This patch doesn't change sadump_header.
Changelog:
v4:
- Do not change max_mapnr_64 in kdump_sub_header in memory for old kernel.
v3:
- Change notes for max_mapnr, start_pfn and end_pfn as obsolete.
- Remove (32bit) from debug messages of max_mapnr, start_pfn and end_pfn.
- Set the 32bit start_pfn and end_pfn to UINT_MAX.
- Remove bitmap writting enhancement to another seperate patch.
- Change type of len_bitmap in struct DumpInfo back to unsigned long.
v2:
- Rename max_mapnr in struct kdump_sub_header to max_mapnr_64.
- Change type of max_mapnr_64 from unsigned long to unsigned long long.
In x86 PAE mode on x86_32 kernel, the address may exceeds 44bit limit.
- Add start_pfn_64, end_pfn_64 for struct kdump_sub_header.
- Only print 64bit start_pfn_64, end_pfn_64 and max_mapnr_64
debug messages for disk dump header version = 6.
- Change type of bitmap_len in struct DumpInfo, from unsigned long to
unsigned long long.
- Enhance bitmap writting function in reassemble_kdump_header().
Prevent bitmap writting failure if the size of bitmap is too large to
fit a sigle write.
v1:
- http://lists.infradead.org/pipermail/kexec/2013-September/009662.html
Signed-off-by: Jingbai Ma jingbai...@hp.com
Tested-by: Lisa Mitchell lisa.mitch...@hp.com
Acked-by: Petr Tesarik ptesa...@suse.cz
diff --git a/IMPLEMENTATION b/IMPLEMENTATION
index f0f3135..2f4cfd6 100644
--- a/IMPLEMENTATION
+++ b/IMPLEMENTATION
@@ -48,7 +48,9 @@
header in blocks */
unsigned intbitmap_blocks; /* Size of Memory bitmap in
block */
-unsigned intmax_mapnr; /* = max_mapnr */
+unsigned intmax_mapnr; /* = max_mapnr, OBSOLETE!
+ 32bit only, full 64bit
+
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2013-09-13 14:46:15
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2013-09-11 12:20:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2013-09-13 14:46:16.0 +0200
@@ -1,0 +2,6 @@
+Wed Sep 11 12:36:24 UTC 2013 - dval...@suse.com
+
+- makedumpfile-powerpc.patch: fix builf on powerpc
+- makedumpfile.spec: enable powerpc32
+
+---
New:
makedumpfile-powerpc.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.F1P3PE/_old 2013-09-13 14:46:16.0 +0200
+++ /var/tmp/diff_new_pack.F1P3PE/_new 2013-09-13 14:46:16.0 +0200
@@ -37,8 +37,9 @@
Source: %{name}-%{version}.tar.bz2
Source1:README.static
Patch0: %{name}-coptflags.diff
+Patch1: %{name}-powerpc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 x86_64 ia64 ppc64 s390x %arm
+ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 s390x %arm
%description
makedumpfile is a dump program to shorten the size of dump file. It
@@ -55,6 +56,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
LIBS_STATIC=
++ makedumpfile-powerpc.patch ++
From: Baoquan He b...@redhat.com
Date: Mon Jul 15 20:37:14 2013 +0800
Subject: Add vmap_area_list definition for ppc/ppc64
References: http://lists.infradead.org/pipermail/kexec/2013-July/009286.html
Upstream: merged
vmap_area_list is added to get vmalloc_start for ppc/ppc64, but its
definition is missing, now add them.
Signed-off-by: Baoquan He b...@redhat.com
Acked-by: Dinar Valeev dval...@suse.com
Acked-by: Petr Tesarik ptesa...@suse.com
diff --git a/arch/ppc.c b/arch/ppc.c
index a9b4812..a3e1a12 100644
--- a/arch/ppc.c
+++ b/arch/ppc.c
@@ -28,7 +28,7 @@
int
get_machdep_info_ppc(void)
{
- unsigned long vmlist, vmalloc_start;
+ unsigned long vmlist, vmap_area_list, vmalloc_start;
info-section_size_bits = _SECTION_SIZE_BITS;
info-max_physmem_bits = _MAX_PHYSMEM_BITS;
diff --git a/arch/ppc64.c b/arch/ppc64.c
index c229ede..85144f6 100644
--- a/arch/ppc64.c
+++ b/arch/ppc64.c
@@ -49,7 +49,7 @@ set_ppc64_max_physmem_bits(void)
int
get_machdep_info_ppc64(void)
{
- unsigned long vmlist, vmalloc_start;
+ unsigned long vmlist, vmap_area_list, vmalloc_start;
info-section_size_bits = _SECTION_SIZE_BITS;
if (!set_ppc64_max_physmem_bits()) {
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2013-09-11 12:20:32
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2013-02-11 11:05:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2013-09-11 12:20:33.0 +0200
@@ -1,0 +2,9 @@
+Mon Sep 9 21:55:55 UTC 2013 - ptesa...@suse.cz
+
+- upgrade to makedumpfile-1.5.4
+ o support kernels up to 3.9
+ o speed improvements with mmap(2)
+ o bugfixes
+- makedumpfile-handle-structured-log_buf: upstream.
+
+---
Old:
makedumpfile-1.5.1.tar.bz2
makedumpfile-handle-structured-log_buf
New:
makedumpfile-1.5.4.tar.bz2
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.YiIHhd/_old 2013-09-11 12:20:33.0 +0200
+++ /var/tmp/diff_new_pack.YiIHhd/_new 2013-09-11 12:20:33.0 +0200
@@ -28,7 +28,7 @@
%endif
BuildRequires: lzma-devel
BuildRequires: lzo-devel
-Version:1.5.1
+Version:1.5.4
Release:0
Summary:Partial kernel dump
License:GPL-2.0
@@ -37,7 +37,6 @@
Source: %{name}-%{version}.tar.bz2
Source1:README.static
Patch0: %{name}-coptflags.diff
-Patch1: %{name}-handle-structured-log_buf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc64 s390x %arm
@@ -56,7 +55,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
LIBS_STATIC=
++ makedumpfile-1.5.1.tar.bz2 - makedumpfile-1.5.4.tar.bz2 ++
3790 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2013-02-11 11:05:41
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile, Maintainer is ptesa...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2012-12-09 14:10:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2013-02-11 11:05:44.0 +0100
@@ -1,0 +2,5 @@
+Mon Jan 28 22:46:29 UTC 2013 - je...@suse.com
+
+- Added support for structured logging added in Linux v3.5. (bnc#801063)
+
+---
New:
makedumpfile-handle-structured-log_buf
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.EbaeyH/_old 2013-02-11 11:05:45.0 +0100
+++ /var/tmp/diff_new_pack.EbaeyH/_new 2013-02-11 11:05:45.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package makedumpfile
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -37,6 +37,7 @@
Source: %{name}-%{version}.tar.bz2
Source1:README.static
Patch0: %{name}-coptflags.diff
+Patch1: %{name}-handle-structured-log_buf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc64 s390x %arm
@@ -55,6 +56,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
LIBS_STATIC=
++ makedumpfile-handle-structured-log_buf ++
From: Jeff Mahoney je...@suse.com
Subject: Handle Linux = v3.5 structured logging properly
Patch-mainline:
https://sourceforge.net/tracker/?func=detailaid=3602521group_id=178938atid=887142
References: bnc#801063
Linux v3.5 added structured logging which needs different handling
than the simple ring buffer used in previous revisions. Each log
entry consists of a header, text, and an optional dictionary of
key/value pairs. As a result, we need to parse the headers and
pull the text out of the records. The result is the same flat text
file everyone is used to seeing.
Signed-off-by: Jeff Mahoney je...@suse.com
---
makedumpfile.c | 398 ++---
makedumpfile.h | 13 +
2 files changed, 363 insertions(+), 48 deletions(-)
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -848,6 +848,8 @@ get_symbol_info(void)
SYMBOL_INIT(log_buf, log_buf);
SYMBOL_INIT(log_buf_len, log_buf_len);
SYMBOL_INIT(log_end, log_end);
+ SYMBOL_INIT(log_first_idx, log_first_idx);
+ SYMBOL_INIT(log_next_idx, log_next_idx);
SYMBOL_INIT(max_pfn, max_pfn);
SYMBOL_INIT(modules, modules);
SYMBOL_INIT(high_memory, high_memory);
@@ -1175,6 +1177,14 @@ get_structure_info(void)
OFFSET_INIT(elf64_phdr.p_paddr, elf64_phdr, p_paddr);
OFFSET_INIT(elf64_phdr.p_memsz, elf64_phdr, p_memsz);
+ /* Structure sizes for structured logging */
+ SIZE_INIT(log, log);
+ OFFSET_INIT(log.ts_nsec, log, ts_nsec);
+ OFFSET_INIT(log.len, log, len);
+ OFFSET_INIT(log.text_len, log, text_len);
+ OFFSET_INIT(log.dict_len, log, dict_len);
+ OFFSET_INIT(log.flags, log, flags);
+
return TRUE;
}
@@ -1353,6 +1363,8 @@ write_vmcoreinfo_data(void)
WRITE_SYMBOL(log_buf, log_buf);
WRITE_SYMBOL(log_buf_len, log_buf_len);
WRITE_SYMBOL(log_end, log_end);
+ WRITE_SYMBOL(log_first_idx, log_first_idx);
+ WRITE_SYMBOL(log_next_idx, log_next_idx);
WRITE_SYMBOL(max_pfn, max_pfn);
WRITE_SYMBOL(high_memory, high_memory);
WRITE_SYMBOL(node_remap_start_vaddr, node_remap_start_vaddr);
@@ -1371,6 +1383,7 @@ write_vmcoreinfo_data(void)
WRITE_STRUCTURE_SIZE(node_memblk_s, node_memblk_s);
WRITE_STRUCTURE_SIZE(nodemask_t, nodemask_t);
WRITE_STRUCTURE_SIZE(pageflags, pageflags);
+ WRITE_STRUCTURE_SIZE(log, log);
/*
* write the member offset of 1st kernel
@@ -1404,6 +1417,12 @@ write_vmcoreinfo_data(void)
WRITE_MEMBER_OFFSET(node_memblk_s.nid, node_memblk_s.nid);
WRITE_MEMBER_OFFSET(vm_struct.addr, vm_struct.addr);
+ WRITE_MEMBER_OFFSET(log.ts_nsec, log.ts_nsec);
+ WRITE_MEMBER_OFFSET(log.len, log.len);
+ WRITE_MEMBER_OFFSET(log.text_len, log.text_len);
+ WRITE_MEMBER_OFFSET(log.dict_len, log.dict_len);
+ WRITE_MEMBER_OFFSET(log.flags, log.flags);
+
if (SYMBOL(node_data)
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2012-12-09 14:10:08
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile, Maintainer is ptesa...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2012-10-26 17:24:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2012-12-09 14:10:13.0 +0100
@@ -1,0 +2,16 @@
+Fri Dec 7 15:58:28 UTC 2012 - ptesa...@suse.cz
+
+- upgrade to makedumpfile-1.5.1
+ o Support for Xen4 Dom0 dumps
+ o Introduce mem_map array logic
+- makedumpfile-x86-return-in-nonvoid-function.patch: dropped.
+
+---
+Tue Nov 20 23:37:22 UTC 2012 - ptesa...@suse.cz
+
+- upgrade to makedumpfile-1.5.0
+ o implement cyclic mode
+ o update necessary elfutils version
+ o tested for kernels up to 3.4.8
+
+---
Old:
makedumpfile-1.4.4.tar.bz2
makedumpfile-x86-return-in-nonvoid-function.patch
New:
makedumpfile-1.5.1.tar.bz2
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.h0YPir/_old 2012-12-09 14:10:14.0 +0100
+++ /var/tmp/diff_new_pack.h0YPir/_new 2012-12-09 14:10:14.0 +0100
@@ -23,10 +23,12 @@
BuildRequires: zlib-devel
%if 0%{?suse_version} = 1140 || 0%{?sles_version} = 11
BuildRequires: libbz2-devel
-BuildRequires: lzma-devel
+%else
+BuildRequires: bzip2
%endif
+BuildRequires: lzma-devel
BuildRequires: lzo-devel
-Version:1.4.4
+Version:1.5.1
Release:0
Summary:Partial kernel dump
License:GPL-2.0
@@ -35,7 +37,6 @@
Source: %{name}-%{version}.tar.bz2
Source1:README.static
Patch0: %{name}-coptflags.diff
-Patch1: %{name}-x86-return-in-nonvoid-function.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc64 s390x %arm
@@ -54,7 +55,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
LIBS_STATIC=
++ makedumpfile-1.4.4.tar.bz2 - makedumpfile-1.5.1.tar.bz2 ++
3727 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2012-10-26 17:24:13
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile, Maintainer is ptesa...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2011-11-10 15:50:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2012-10-26 17:24:15.0 +0200
@@ -1,0 +2,18 @@
+Wed Sep 26 21:08:36 UTC 2012 - lchiqui...@suse.com
+
+- include makedumpfile.conf(5) man page in the package.
+
+---
+Tue Jun 19 12:10:40 UTC 2012 - ptesa...@suse.cz
+
+- makedumpfile-x86-return-in-nonvoid-function.patch: add a missing
+ return statement.
+
+---
+Mon Jun 18 16:12:40 UTC 2012 - ptesa...@suse.cz
+
+- upgrade to makedumpfile-1.4.4.
+- activate LZO support
+- makedumpfile-supports-3.0.patch: dropped (upstreams).
+
+---
Old:
makedumpfile-1.4.0.tar.bz2
makedumpfile-supports-3.0.patch
New:
makedumpfile-1.4.4.tar.bz2
makedumpfile-x86-return-in-nonvoid-function.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.X4IaVC/_old 2012-10-26 17:24:16.0 +0200
+++ /var/tmp/diff_new_pack.X4IaVC/_new 2012-10-26 17:24:16.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package makedumpfile
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,24 +15,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: makedumpfile
-BuildRequires: libdw-devel libebl-devel libelf-devel zlib-devel
+BuildRequires: libdw-devel
+BuildRequires: libebl-devel
+BuildRequires: libelf-devel
+BuildRequires: zlib-devel
%if 0%{?suse_version} = 1140 || 0%{?sles_version} = 11
-BuildRequires: libbz2-devel lzma-devel
+BuildRequires: libbz2-devel
+BuildRequires: lzma-devel
%endif
-License:GPL-2.0
-Version:1.4.0
-Release:1
+BuildRequires: lzo-devel
+Version:1.4.4
+Release:0
Summary:Partial kernel dump
+License:GPL-2.0
Group: System/Kernel
Url:https://sourceforge.net/projects/makedumpfile/
Source: %{name}-%{version}.tar.bz2
Source1:README.static
Patch0: %{name}-coptflags.diff
-Patch1: %{name}-supports-3.0.patch
+Patch1: %{name}-x86-return-in-nonvoid-function.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ia64 ppc64 s390x %arm
@@ -71,14 +74,16 @@
fi
fi
export LIBS_STATIC LIBS_DYNAMIC
-make COPTFLAGS=$RPM_OPT_FLAGS
+make COPTFLAGS=$RPM_OPT_FLAGS USELZO=on
%install
mkdir -p $RPM_BUILD_ROOT/bin
install -c -m 0755 makedumpfile $RPM_BUILD_ROOT/bin
install -c -m 0755 makedumpfile-R.pl $RPM_BUILD_ROOT/bin
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
install -c -m 0644 makedumpfile.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -c -m 0644 makedumpfile.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5
%clean
[ $RPM_BUILD_ROOT != / ] rm -rf $RPM_BUILD_ROOT
++ makedumpfile-1.4.0.tar.bz2 - makedumpfile-1.4.4.tar.bz2 ++
4655 lines of diff (skipped)
++ makedumpfile-coptflags.diff ++
--- /var/tmp/diff_new_pack.X4IaVC/_old 2012-10-26 17:24:16.0 +0200
+++ /var/tmp/diff_new_pack.X4IaVC/_new 2012-10-26 17:24:16.0 +0200
@@ -1,13 +1,13 @@
---
- Makefile |9 ++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
+ Makefile |8
+ 1 file changed, 4 insertions(+), 4 deletions(-)
--- a/Makefile
+++ b/Makefile
-@@ -4,10 +4,10 @@ VERSION=1.4.0
- DATE=12 September 2011
-
+@@ -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 \
@@ -17,12 +17,15 @@
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
# LDFLAGS = -L/usr/local/lib -I/usr/local/include
-@@ -38,7 +38,7 @@ $(OBJ_ARCH): $(SRC_ARCH)
- $(CC) $(CFLAGS_ARCH) -c -o ./$@ ./$(@:.o=.c)
+@@ -45,9 +45,9 @@ OBJ_PART = print_info.o dwarf_info.o elf
+ SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c
commit makedumpfile for openSUSE:Factory
Hello community,
here is the log from the commit of package makedumpfile for openSUSE:Factory
checked in at 2011-11-10 15:50:51
Comparing /work/SRC/openSUSE:Factory/makedumpfile (Old)
and /work/SRC/openSUSE:Factory/.makedumpfile.new (New)
Package is makedumpfile, Maintainer is ptesa...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/makedumpfile/makedumpfile.changes
2011-09-23 02:12:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.makedumpfile.new/makedumpfile.changes
2011-11-10 15:50:54.0 +0100
@@ -1,0 +2,31 @@
+Wed Nov 9 17:31:50 UTC 2011 - ptesa...@suse.cz
+
+- README.static: Explain why static linking of some libraries is
+ preferred.
+
+---
+Thu Nov 3 07:48:12 UTC 2011 - cfarr...@suse.com
+
+- license update: GPL-2.0
+ SPDX format (http://www.spdx.org/licenses)
+
+---
+Wed Nov 2 22:03:33 UTC 2011 - ptesa...@suse.cz
+
+- Fix build on older distros.
+
+---
+Mon Oct 31 07:28:59 UTC 2011 - ptesa...@suse.cz
+
+- fix the specfile License tag: since ppc64.c and s390x.c are
+ licensed under GPL-2.0 only, the whole package cannot be GPL-2.0
+ or later (bnc#727022).
+
+---
+Thu Oct 27 05:15:53 UTC 2011 - ptesa...@suse.cz
+
+- upgrade to makedumpfile-1.4.0.
+- makedumpfile-supports-3.0.patch: Mark all kernel 3.0 releases
+ as supported.
+
+---
Old:
makedumpfile-1.3.6.tar.bz2
New:
README.static
makedumpfile-1.4.0.tar.bz2
makedumpfile-supports-3.0.patch
Other differences:
--
++ makedumpfile.spec ++
--- /var/tmp/diff_new_pack.aFMhRJ/_old 2011-11-10 15:50:55.0 +0100
+++ /var/tmp/diff_new_pack.aFMhRJ/_new 2011-11-10 15:50:55.0 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package makedumpfile (Version 1.3.6)
+# spec file for package makedumpfile
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,22 +19,22 @@
Name: makedumpfile
-BuildRequires: zlib-devel
-%if 0%{?suse_version} 1100
-BuildRequires: libdw-devel
-%else
-BuildRequires: libdw-devel libdw1 libelf-devel libelf0 libelf1
+BuildRequires: libdw-devel libebl-devel libelf-devel zlib-devel
+%if 0%{?suse_version} = 1140 || 0%{?sles_version} = 11
+BuildRequires: libbz2-devel lzma-devel
%endif
-License:GPLv2+
-Version:1.3.6
+License:GPL-2.0
+Version:1.4.0
Release:1
Summary:Partial kernel dump
Group: System/Kernel
Url:https://sourceforge.net/projects/makedumpfile/
Source: %{name}-%{version}.tar.bz2
+Source1:README.static
Patch0: %{name}-coptflags.diff
+Patch1: %{name}-supports-3.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch: %ix86 x86_64 ia64 ppc64
+ExclusiveArch: %ix86 x86_64 ia64 ppc64 s390x %arm
%description
makedumpfile is a dump program to shorten the size of dump file. It
@@ -51,8 +51,26 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
+LIBS_STATIC=
+LIBS_DYNAMIC=
+if nm -u -f posix %{_libdir}/libdw.a | grep '^BZ2_bzDecompress U'; then
+ if [ -e %{_libdir}/libbz2.a ]; then
+LIBS_STATIC=$LIBS_STATIC -lbz2
+ else
+LIBS_DYNAMIC=$LIBS_DYNAMIC -lbz2
+ fi
+fi
+if nm -u -f posix %{_libdir}/libdw.a | grep '^lzma_code U'; then
+ if [ -e %{_libdir}/liblzma.a ]; then
+LIBS_STATIC=$LIBS_STATIC -llzma
+ else
+LIBS_DYNAMIC=$LIBS_DYNAMIC -llzma
+ fi
+fi
+export LIBS_STATIC LIBS_DYNAMIC
make COPTFLAGS=$RPM_OPT_FLAGS
%install
++ README.static ++
Q: Why is makedumpfile linked statically?
A: To save space.
Loner answer follows.
The secondary kernel runs in a very constrained environment. It cannot use
the whole RAM of the machine, simply because this is the data that should
be saved. Instead, it uses a special portion of RAM that is reserved for
that purpose in the primary kernel. Since this is memory that cannot be
used by the primary kernel (it is basically dead unless there is a kernel
crash, which should be a rare event), it is desirable to keep the size of
the reserved memory as small as possible.
One thing that takes up RAM in the secondary kernel is the root file
system. Now, the makedumpfile binary is also run from this filesystem.
Consequently, initrd must also include all the
