From 6abe6ad4ca8e201ed3b3940a7831fd0f326611bc09d1e8137f0a79327b98ed1e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 17 Mar 2010 13:22:56 +0000 Subject: [PATCH] Accepting request 34963 from Kernel:kdump checked in (request 34963) OBS-URL: https://build.opensuse.org/request/show/34963 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=10 --- kexec-tools-xen-static.diff | 37 +++++++------------------------------ kexec-tools.changes | 16 ---------------- kexec-tools.spec | 3 +-- 3 files changed, 8 insertions(+), 48 deletions(-) diff --git a/kexec-tools-xen-static.diff b/kexec-tools-xen-static.diff index 5f85bd2..e59b420 100644 --- a/kexec-tools-xen-static.diff +++ b/kexec-tools-xen-static.diff @@ -7,36 +7,13 @@ to use Xen support without a runtime dependency to the Xen package. Signed-off-by: Bernhard Walle -================================================================================ ---- 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 @@ +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -128,7 +128,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 248f70d..8fffd0b 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -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 @@ -37,11 +26,6 @@ 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 788f068..5f8b71c 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -48,7 +48,6 @@ 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 @@ -80,7 +79,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=/ \