From 57787f5b0738e21cc136feceae724ff57ff5bb4b06e04f54cd4a52efd7f7ebfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Tesa=C5=99=C3=ADk?= Date: Mon, 20 Sep 2010 13:46:28 +0000 Subject: [PATCH] Accepting request 47922 from home:bwalle:branches:Kernel:kdump OBS-URL: https://build.opensuse.org/request/show/47922 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=11 --- kexec-tools-2.0.1.tar.bz2 | 3 --- ...1-rpmlintrc => kexec-tools-2.0.2-rpmlintrc | 0 kexec-tools-2.0.2.tar.bz2 | 3 +++ kexec-tools-increase-kernel-text-size.diff | 13 ---------- kexec-tools-xen-static.diff | 13 +++++----- kexec-tools.changes | 24 +++++++++++++++++++ kexec-tools.spec | 11 ++++----- ready | 0 8 files changed, 38 insertions(+), 29 deletions(-) delete mode 100644 kexec-tools-2.0.1.tar.bz2 rename kexec-tools-2.0.1-rpmlintrc => kexec-tools-2.0.2-rpmlintrc (100%) create mode 100644 kexec-tools-2.0.2.tar.bz2 delete mode 100644 kexec-tools-increase-kernel-text-size.diff delete mode 100644 ready diff --git a/kexec-tools-2.0.1.tar.bz2 b/kexec-tools-2.0.1.tar.bz2 deleted file mode 100644 index 19e50e6..0000000 --- a/kexec-tools-2.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f61f7be8896d4e3ee788712c564296bcb431e2e0b0564cc14b40a81b6df8d311 -size 269432 diff --git a/kexec-tools-2.0.1-rpmlintrc b/kexec-tools-2.0.2-rpmlintrc similarity index 100% rename from kexec-tools-2.0.1-rpmlintrc rename to kexec-tools-2.0.2-rpmlintrc diff --git a/kexec-tools-2.0.2.tar.bz2 b/kexec-tools-2.0.2.tar.bz2 new file mode 100644 index 0000000..6f0344f --- /dev/null +++ b/kexec-tools-2.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9acb94dcf4cee2a04da18112a6e5732cdcbe98f893039a93582d88307e0103f +size 305961 diff --git a/kexec-tools-increase-kernel-text-size.diff b/kexec-tools-increase-kernel-text-size.diff deleted file mode 100644 index ef8aae2..0000000 --- a/kexec-tools-increase-kernel-text-size.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kexec/arch/x86_64/crashdump-x86_64.h b/kexec/arch/x86_64/crashdump-x86_64.h -index 9f4dee9..0e83527 100644 ---- a/kexec/arch/x86_64/crashdump-x86_64.h -+++ b/kexec/arch/x86_64/crashdump-x86_64.h -@@ -11,7 +11,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline, - #define MAXMEM 0x3fffffffffffUL - - /* Kernel text size */ --#define KERNEL_TEXT_SIZE (40UL*1024*1024) -+#define KERNEL_TEXT_SIZE (512UL*1024*1024) - - #define CRASH_MAX_MEMMAP_NR (KEXEC_MAX_SEGMENTS + 1) - #define CRASH_MAX_MEMORY_RANGES (MAX_MEMORY_RANGES + 2) diff --git a/kexec-tools-xen-static.diff b/kexec-tools-xen-static.diff index e59b420..08acc05 100644 --- a/kexec-tools-xen-static.diff +++ b/kexec-tools-xen-static.diff @@ -7,13 +7,12 @@ to use Xen support without a runtime dependency to the Xen package. Signed-off-by: Bernhard Walle ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -128,7 +128,8 @@ fi +================================================================================ +Index: kexec-tools-2.0.2/configure.ac +=================================================================== +--- kexec-tools-2.0.2.orig/configure.ac ++++ kexec-tools-2.0.2/configure.ac +@@ -155,7 +155,8 @@ fi dnl find Xen control stack libraries if test "$with_xen" = yes ; then AC_CHECK_HEADER(xenctrl.h, diff --git a/kexec-tools.changes b/kexec-tools.changes index 8fffd0b..8364ff9 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sun Sep 12 07:26:33 UTC 2010 - bernhard@bwalle.de + +- Update to kexec-tools 2.0.2 (bug fix release). The complete + changelog can be viewed at + http://git.kernel.org/?p=utils/kernel/kexec/kexec-tools.git;a=shortlog;h=refs/tags/v2.0.2. +- Drop kexec-tools-increase-kernel-text-size.diff: Mainline. + +------------------------------------------------------------------- +Tue Mar 16 15:39:45 CET 2010 - ro@suse.de + +- disable autoreconf to fix build +- drop obsolete patch ARM_kexec-zImage-arm_page_to_unistd.diff + +------------------------------------------------------------------- +Wed Feb 10 23:32:34 UTC 2010 - jengelh@medozas.de + +- Add ExclusiveArch to specfile according to source capabilities + ------------------------------------------------------------------- Sun Dec 20 17:33:50 CET 2009 - bernhard@bwalle.de @@ -26,6 +45,11 @@ Sun Dec 20 17:33:50 CET 2009 - bernhard@bwalle.de o kexec-tools-ppc64-dynamic-fix-3.diff o kexec-tools-ppc64-reinit.diff +------------------------------------------------------------------- +Mon Sep 21 13:20:37 UTC 2009 - jansimon.moeller@opensuse.org + +- fix build on arm. kexec-zImage-arm needed s#asm/page.h#unistd.h# + ------------------------------------------------------------------- Wed Aug 12 09:46:46 CEST 2009 - tiwai@suse.de diff --git a/kexec-tools.spec b/kexec-tools.spec index 5f8b71c..ff3c365 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,7 +1,7 @@ # # spec file for package kexec-tools (Version 2.0.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -28,8 +28,8 @@ Requires: perl-Bootloader PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Tools for fast kernel loading -Version: 2.0.1 -Release: 1 +Version: 2.0.2 +Release: 2 Source: %{name}-%{version}.tar.bz2 Source1: kexec-bootloader Source2: kexec-bootloader.8.txt @@ -37,8 +37,7 @@ Source3: kexec.init Source4: %{name}-%{version}-rpmlintrc Patch0: %{name}-no-vga-output.diff Patch1: %{name}-xen-static.diff -Patch2: %{name}-increase-kernel-text-size.diff -Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/ +Url: ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: fop BuildRequires: zlib-devel @@ -48,6 +47,7 @@ BuildRequires: asciidoc libxslt %ifarch %ix86 x86_64 BuildRequires: xen-devel %endif +ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 s390 s390x arm sh mips mipsel %description Kexec is a user space utility for loading another kernel and asking the @@ -70,7 +70,6 @@ Authors: %setup -q -n kexec-tools-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build # disable as-needed diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000