Accepting request 139385 from Kernel:kdump
Ship makedumpfile.conf.5. (forwarded request 136137 from leonardocf) OBS-URL: https://build.opensuse.org/request/show/139385 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/makedumpfile?expand=0&rev=42
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
829f10b9bb
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:772ff9212f6d139fab1f33fd0016e9ca1b66053dff2ca818506acb44a0665fa1
|
||||
size 81016
|
||||
3
makedumpfile-1.4.4.tar.bz2
Normal file
3
makedumpfile-1.4.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:862ce95e3b45ad6f27a4babbab3918981ab862287251645b37897531df9191f1
|
||||
size 95178
|
||||
@ -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 arch/ppc64.c arch/s390x.c arch/ppc.c
|
||||
OBJ_ARCH = arch/arm.o arch/x86.o arch/x86_64.o arch/ia64.o arch/ppc64.o arch/s390x.o arch/ppc.o
|
||||
|
||||
makedumpfile: $(SRC) $(OBJ_PART) $(OBJ_ARCH)
|
||||
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -o $@ $< -static -ldw -lbz2 -lebl -ldl -lelf -lz
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ_PART) $(OBJ_ARCH) -o $@ $< -Wl,-Bstatic -ldw -lebl -lelf $(LIBS_STATIC) -Wl,-Bdynamic -ldl -lz $(LIBS_DYNAMIC)
|
||||
echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8
|
||||
grep -v "^.TH MAKEDUMPFILE 8" makedumpfile.8 >> temp.8
|
||||
mv temp.8 makedumpfile.8
|
||||
-LIBS = -ldw -lbz2 -lebl -ldl -lelf -lz
|
||||
+LIBS = -ldw -lebl -lelf $(LIBS_STATIC) -Wl,-Bdynamic -ldl -lz $(LIBS_DYNAMIC)
|
||||
ifneq ($(LINKTYPE), dynamic)
|
||||
-LIBS := -static $(LIBS)
|
||||
+LIBS := -Wl,-Bstatic $(LIBS)
|
||||
endif
|
||||
|
||||
ifeq ($(USELZO), on)
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From: Petr Tesarik <ptesarik@suse.cz>
|
||||
Subject: Mark kernel 3.0 as supported
|
||||
References: bnc#719648
|
||||
|
||||
Without the patch, makedumpfile gives the following warning:
|
||||
|
||||
The kernel version is not supported.
|
||||
The created dumpfile may be incomplete.
|
||||
|
||||
Since makedumpfile has been successfully tested with kernel 3.0, let's
|
||||
mark all 3.0 releases as supported. This is no problem, at least for
|
||||
SLES, because incompatible changes are forbidden by the policy.
|
||||
|
||||
Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
|
||||
|
||||
---
|
||||
makedumpfile.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/makedumpfile.h
|
||||
+++ b/makedumpfile.h
|
||||
@@ -447,7 +447,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(2, 6, 36)/* linux-2.6.36 */
|
||||
+#define LATEST_VERSION KERNEL_VERSION(3, 0, 0xffff) /* linux-3.0, all releases */
|
||||
|
||||
/*
|
||||
* vmcoreinfo in /proc/vmcore
|
||||
14
makedumpfile-x86-return-in-nonvoid-function.patch
Normal file
14
makedumpfile-x86-return-in-nonvoid-function.patch
Normal file
@ -0,0 +1,14 @@
|
||||
---
|
||||
arch/x86.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/arch/x86.c
|
||||
+++ b/arch/x86.c
|
||||
@@ -64,6 +64,7 @@ remap_init(void)
|
||||
}
|
||||
|
||||
max_numnodes = n;
|
||||
+ return TRUE;
|
||||
}
|
||||
|
||||
int
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 26 21:08:36 UTC 2012 - lchiquitto@suse.com
|
||||
|
||||
- include makedumpfile.conf(5) man page in the package.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 19 12:10:40 UTC 2012 - ptesarik@suse.cz
|
||||
|
||||
- makedumpfile-x86-return-in-nonvoid-function.patch: add a missing
|
||||
return statement.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 18 16:12:40 UTC 2012 - ptesarik@suse.cz
|
||||
|
||||
- upgrade to makedumpfile-1.4.4.
|
||||
- activate LZO support
|
||||
- makedumpfile-supports-3.0.patch: dropped (upstreams).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 9 17:31:50 UTC 2011 - ptesarik@suse.cz
|
||||
|
||||
|
||||
@ -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 @@ if nm -u -f posix %{_libdir}/libdw.a | grep '^lzma_code U'; then
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user