From 79074bd214ee2cf71af2aaa02bb8857c63f7931847e852b18f4bd87c8a282f00 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 17 Nov 2008 16:22:43 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/makedumpfile?expand=0&rev=23 --- makedumpfile-2.6.27.diff | 25 +++++++++++++++++++++++++ makedumpfile.changes | 6 ++++++ makedumpfile.spec | 20 +++++++++++++++----- 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 makedumpfile-2.6.27.diff diff --git a/makedumpfile-2.6.27.diff b/makedumpfile-2.6.27.diff new file mode 100644 index 0000000..3548f96 --- /dev/null +++ b/makedumpfile-2.6.27.diff @@ -0,0 +1,25 @@ +# HG changeset patch +# User Bernhard Walle +# Date 1226482672 -3600 +# Node ID 9dccce624c6991f9e7f778dc18f334bfcf2063b8 +# Parent d9fb89bb3bbc78f2fcd313bbb75bbbbff35a7a42 +Claim to support 2.6.27 + +According to the changelog and my tests, 2.6.27 kernel is supported. Express +that in the LATEST_VERSION check. + + +Signed-off-by: Bernhard Walle + +diff -r d9fb89bb3bbc -r 9dccce624c69 makedumpfile.h +--- a/makedumpfile.h Wed Nov 12 10:36:17 2008 +0100 ++++ b/makedumpfile.h Wed Nov 12 10:37:52 2008 +0100 +@@ -436,7 +436,7 @@ + #define KVER_MIN_SHIFT 16 + #define KERNEL_VERSION(x,y,z) (((x) << KVER_MAJ_SHIFT) | ((y) << KVER_MIN_SHIFT) | (z)) + #define OLDEST_VERSION (0x0206000f) /* linux-2.6.15 */ +-#define LATEST_VERSION (0x0206001a) /* linux-2.6.26 */ ++#define LATEST_VERSION (0x0206001b) /* linux-2.6.27 */ + #define VERSION_LINUX_2_6_26 (0x0206001a) /* linux-2.6.26 */ + #define VERSION_LINUX_2_6_27 (0x0206001b) /* linux-2.6.27 */ + diff --git a/makedumpfile.changes b/makedumpfile.changes index 2d9f9a3..ae0d777 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 12 10:38:45 CET 2008 - bwalle@suse.de + +- Don't print the "The kernel version is not supported" message + for 2.6.27 (bnc#440225). + ------------------------------------------------------------------- Sat Oct 11 19:11:56 CEST 2008 - bwalle@suse.de diff --git a/makedumpfile.spec b/makedumpfile.spec index 14f1fed..80dad95 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -19,16 +19,22 @@ Name: makedumpfile -BuildRequires: gcc-c++ libdw-devel libdw1 libelf-devel libelf0 libelf1 zlib-devel +BuildRequires: gcc-c++ zlib-devel %define elfutils_version 0.124 +%if 0%{?suse_version} > 1100 +BuildRequires: libdw-devel +%else +BuildRequires: libdw-devel libdw1 libelf-devel libelf0 libelf1 +%endif License: GPL v2 or later Version: 1.3.0 -Release: 1 +Release: 2 Summary: Partial kernel dump Group: System/Kernel Url: https://sourceforge.net/projects/makedumpfile/ -Source: makedumpfile-%{version}.tar.bz2 -Patch: makedumpfile-coptflags.diff +Source: %{name}-%{version}.tar.bz2 +Patch0: %{name}-coptflags.diff +Patch1: %{name}-2.6.27.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,7 +51,8 @@ Authors: %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 %build make COPTFLAGS="$RPM_OPT_FLAGS" @@ -67,6 +74,9 @@ install -c -m 0644 makedumpfile.8 $RPM_BUILD_ROOT%{_mandir}/man8 /bin/* %changelog +* Wed Nov 12 2008 bwalle@suse.de +- Don't print the "The kernel version is not supported" message + for 2.6.27 (bnc#440225). * Sat Oct 11 2008 bwalle@suse.de - Update to 1.3.0 * features