diff --git a/kexec-tools-2.0.2-rpmlintrc b/kexec-tools-2.0.1-rpmlintrc similarity index 100% rename from kexec-tools-2.0.2-rpmlintrc rename to kexec-tools-2.0.1-rpmlintrc diff --git a/kexec-tools-2.0.1.tar.bz2 b/kexec-tools-2.0.1.tar.bz2 new file mode 100644 index 0000000..19e50e6 --- /dev/null +++ b/kexec-tools-2.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f61f7be8896d4e3ee788712c564296bcb431e2e0b0564cc14b40a81b6df8d311 +size 269432 diff --git a/kexec-tools-2.0.2.tar.bz2 b/kexec-tools-2.0.2.tar.bz2 deleted file mode 100644 index 6f0344f..0000000 --- a/kexec-tools-2.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..ef8aae2 --- /dev/null +++ b/kexec-tools-increase-kernel-text-size.diff @@ -0,0 +1,13 @@ +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 08acc05..5f85bd2 100644 --- a/kexec-tools-xen-static.diff +++ b/kexec-tools-xen-static.diff @@ -8,11 +8,35 @@ to use Xen support without a runtime dependency to the Xen package. Signed-off-by: Bernhard Walle ================================================================================ -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 +--- kexec-tools-2.0.1/configure ++++ kexec-tools-2.0.1/configure +@@ -5023,8 +5023,7 @@ + + fi + if test "x$ac_cv_header_xenctrl_h" = x""yes; then +- +-{ $as_echo "$as_me:$LINENO: checking for xc_version in -lxenctrl" >&5 ++ { $as_echo "$as_me:$LINENO: checking for xc_version in -lxenctrl" >&5 + $as_echo_n "checking for xc_version in -lxenctrl... " >&6; } + if test "${ac_cv_lib_xenctrl_xc_version+set}" = set; then + $as_echo_n "(cached) " >&6 +@@ -5090,12 +5089,7 @@ + { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xenctrl_xc_version" >&5 + $as_echo "$ac_cv_lib_xenctrl_xc_version" >&6; } + if test "x$ac_cv_lib_xenctrl_xc_version" = x""yes; then +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBXENCTRL 1 +-_ACEOF +- +- LIBS="-lxenctrl $LIBS" +- ++ LIBS="$LIBS -Wl,-Bstatic -lxenctrl -Wl,-Bdynamic" + else + { $as_echo "$as_me:$LINENO: Xen support disabled" >&5 + $as_echo "$as_me: Xen support disabled" >&6;} +--- kexec-tools-2.0.1/configure.ac ++++ kexec-tools-2.0.1/configure.ac +@@ -145,7 +145,8 @@ 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 8364ff9..248f70d 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/kexec-tools.spec b/kexec-tools.spec index ff3c365..fe9895c 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -28,7 +28,7 @@ Requires: perl-Bootloader PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on Summary: Tools for fast kernel loading -Version: 2.0.2 +Version: 2.0.1 Release: 2 Source: %{name}-%{version}.tar.bz2 Source1: kexec-bootloader @@ -37,7 +37,8 @@ Source3: kexec.init Source4: %{name}-%{version}-rpmlintrc Patch0: %{name}-no-vga-output.diff Patch1: %{name}-xen-static.diff -Url: ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2 +Patch2: %{name}-increase-kernel-text-size.diff +Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: fop BuildRequires: zlib-devel @@ -70,6 +71,7 @@ Authors: %setup -q -n kexec-tools-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # disable as-needed @@ -78,7 +80,7 @@ export SUSE_ASNEEDED=0 %ifarch ia64 RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-fstack-protector//') %endif -autoreconf -f +#autoreconf -f CFLAGS=$RPM_OPT_FLAGS BUILD_CFLAGS=$RPM_OPT_FLAGS \ ./configure \ --prefix=/ \