From 075aeddf01dbd8336c0447e9cc3ebdc8dbd43abfa7d388561eb0ebc846aa0658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Mon, 18 Jun 2012 17:10:04 +0000 Subject: [PATCH 1/3] Accepting request 125358 from home:ptesarik:branches:Kernel:kdump upgrade to 1.4.4 OBS-URL: https://build.opensuse.org/request/show/125358 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=56 --- makedumpfile-1.4.0.tar.bz2 | 3 --- makedumpfile-1.4.4.tar.bz2 | 3 +++ makedumpfile-coptflags.diff | 29 ++++++++++++++++------------- makedumpfile-supports-3.0.patch | 30 ------------------------------ makedumpfile.changes | 7 +++++++ makedumpfile.spec | 23 ++++++++++++----------- 6 files changed, 38 insertions(+), 57 deletions(-) delete mode 100644 makedumpfile-1.4.0.tar.bz2 create mode 100644 makedumpfile-1.4.4.tar.bz2 delete mode 100644 makedumpfile-supports-3.0.patch diff --git a/makedumpfile-1.4.0.tar.bz2 b/makedumpfile-1.4.0.tar.bz2 deleted file mode 100644 index 9e74367..0000000 --- a/makedumpfile-1.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:772ff9212f6d139fab1f33fd0016e9ca1b66053dff2ca818506acb44a0665fa1 -size 81016 diff --git a/makedumpfile-1.4.4.tar.bz2 b/makedumpfile-1.4.4.tar.bz2 new file mode 100644 index 0000000..c2a9493 --- /dev/null +++ b/makedumpfile-1.4.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:862ce95e3b45ad6f27a4babbab3918981ab862287251645b37897531df9191f1 +size 95178 diff --git a/makedumpfile-coptflags.diff b/makedumpfile-coptflags.diff index 667c2ab..30239f8 100644 --- a/makedumpfile-coptflags.diff +++ b/makedumpfile-coptflags.diff @@ -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) diff --git a/makedumpfile-supports-3.0.patch b/makedumpfile-supports-3.0.patch deleted file mode 100644 index 0725ac7..0000000 --- a/makedumpfile-supports-3.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Petr Tesarik -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 - ---- - 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 diff --git a/makedumpfile.changes b/makedumpfile.changes index 5e4d8de..06cedaf 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/makedumpfile.spec b/makedumpfile.spec index a3e1e93..2f4945c 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -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,26 @@ # 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ia64 ppc64 s390x %arm @@ -51,7 +53,6 @@ Authors: %prep %setup -q %patch0 -p1 -%patch1 -p1 %build LIBS_STATIC= @@ -71,7 +72,7 @@ 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 From d27cfa679743ec699e82910a2fcda288bf5e9c064e41d99ecf2e5ffff9a0e83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Tue, 19 Jun 2012 12:12:31 +0000 Subject: [PATCH 2/3] - makedumpfile-x86-return-in-nonvoid-function.patch: add a missing return statement. OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=57 --- makedumpfile-x86-return-in-nonvoid-function.patch | 14 ++++++++++++++ makedumpfile.changes | 6 ++++++ makedumpfile.spec | 2 ++ 3 files changed, 22 insertions(+) create mode 100644 makedumpfile-x86-return-in-nonvoid-function.patch diff --git a/makedumpfile-x86-return-in-nonvoid-function.patch b/makedumpfile-x86-return-in-nonvoid-function.patch new file mode 100644 index 0000000..f26f9e6 --- /dev/null +++ b/makedumpfile-x86-return-in-nonvoid-function.patch @@ -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 diff --git a/makedumpfile.changes b/makedumpfile.changes index 06cedaf..dcb8d5c 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/makedumpfile.spec b/makedumpfile.spec index 2f4945c..4cf8e81 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -35,6 +35,7 @@ Url: https://sourceforge.net/projects/makedumpfile/ 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 @@ -53,6 +54,7 @@ Authors: %prep %setup -q %patch0 -p1 +%patch1 -p1 %build LIBS_STATIC= From 6a2992c0e082aa0cde744c770078a75b2a27330e5d4ce07f60c82cdb6b0d1b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 26 Oct 2012 08:52:56 +0000 Subject: [PATCH 3/3] Accepting request 136137 from home:leonardocf:branches:Kernel:kdump Ship makedumpfile.conf.5. OBS-URL: https://build.opensuse.org/request/show/136137 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=58 --- makedumpfile.changes | 5 +++++ makedumpfile.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/makedumpfile.changes b/makedumpfile.changes index dcb8d5c..6f5b79c 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/makedumpfile.spec b/makedumpfile.spec index 4cf8e81..3369573 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -81,7 +81,9 @@ 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