pool/makedumpfile
SHA256
11
0
Fork 2
Code Issues Pull Requests 1 Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/makedumpfile?expand=0&rev=26

Browse Source
This commit is contained in:
OBS User unknown
2008-12-01 11:27:41 +00:00
committed by Git OBS Bridge
parent ed0d08d1ca
commit 26b33cd7e9
3 changed files with 20 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
makedumpfile-64bit-kernel-on-32bit-userland.diff
View File

@@ -1,47 +0,0 @@
From: Bernhard Walle <bwalle@suse.de>
Subject: [PATCH] Parse 64 bit VMCOREINFO on 32 bit userland
References: bnc #447432
This bug fixes the problem that on a 32 bit userland makedumpfile (as common
on the PPC platform) the parsing of the 64 bit VMCOREINFO fails with:
# makedumpfile -c /home/sachin/dump/vmcore vmcore.filtered
read_vmcoreinfo_symbol: Invalid data in /tmp/vmcoreinfowVoyJK:
SYMBOL(mem_section)=c000000000bb4400
We just need to assume that the symbols are always 'unsigned long long' (64 bit)
instead of 'unsigned long' (native pointer size on Linux platforms).
Signed-off-by: Bernhard Walle <bwalle@suse.de>
---
makedumpfile.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -2271,10 +2271,10 @@ read_vmcoreinfo_basic_info(void)
return TRUE;
}
-unsigned long
+unsigned long long
read_vmcoreinfo_symbol(char *str_symbol)
{
- unsigned long symbol = NOT_FOUND_SYMBOL;
+ unsigned long long symbol = NOT_FOUND_SYMBOL;
char buf[BUFSIZE_FGETS], *endp;
unsigned int i;
@@ -2291,8 +2291,8 @@ read_vmcoreinfo_symbol(char *str_symbol)
if (buf[i - 1] == '\n')
buf[i - 1] = '\0';
if (strncmp(buf, str_symbol, strlen(str_symbol)) == 0) {
- symbol = strtoul(buf + strlen(str_symbol), &endp, 16);
- if ((!symbol || symbol == ULONG_MAX)
+ symbol = strtoull(buf + strlen(str_symbol), &endp, 16);
+ if ((!symbol || symbol == ULONGLONG_MAX)
|| strlen(endp) != 0) {
ERRMSG("Invalid data in %s: %s",
info->name_vmcoreinfo, buf);

12
makedumpfile.changes
View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Dec 01 11:07:19 CET 2008 - bwalle@suse.de
- Exclude 'ppc' from being built.
-------------------------------------------------------------------
Mon Dec 01 10:49:24 CET 2008 - bwalle@suse.de
- Drop makedumpfile-64bit-kernel-on-32bit-userland.diff: Rejected
upstream. We need to use a 64 bit makedumpfile for 64 bit
kernels on PPC64 (bnc#447432).
-------------------------------------------------------------------
Fri Nov 28 10:30:49 CET 2008 - bwalle@suse.de

11
makedumpfile.spec
View File

@@ -27,14 +27,14 @@ BuildRequires: libdw-devel libdw1 libelf-devel libelf0 libelf1
%endif
License: GPL v2 or later
Version: 1.3.1
Release: 1
Release: 2
Summary: Partial kernel dump
Group: System/Kernel
Url: https://sourceforge.net/projects/makedumpfile/
Source: %{name}-%{version}.tar.bz2
Patch0: %{name}-coptflags.diff
Patch1: %{name}-64bit-kernel-on-32bit-userland.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: ppc
%description
makedumpfile is a dump program to shorten the size of dump file. It
@@ -51,7 +51,6 @@ Authors:
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
make COPTFLAGS="$RPM_OPT_FLAGS"
@@ -73,6 +72,12 @@ install -c -m 0644 makedumpfile.8 $RPM_BUILD_ROOT%{_mandir}/man8
/bin/*
%changelog
* Mon Dec 01 2008 bwalle@suse.de
- Exclude 'ppc' from being built.
* Mon Dec 01 2008 bwalle@suse.de
- Drop makedumpfile-64bit-kernel-on-32bit-userland.diff: Rejected
upstream. We need to use a 64 bit makedumpfile for 64 bit
kernels on PPC64 (bnc#447432).
* Fri Nov 28 2008 bwalle@suse.de
- makedumpfile-64bit-kernel-on-32bit-userland.diff: Change return
type of read_vmcoreinfo_symbol() to 'unsigned long long'.