rpm/kexec-tools
SHA256
1
0
Fork 0
forked from pool/kexec-tools
Code Pull Requests Activity

Accepting request 34962 from home:oertel:branches:openSUSE:Factory

Browse Source 
Copy from home:oertel:branches:openSUSE:Factory/kexec-tools via accept of submit request 34962 revision 4.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/34962
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=9
This commit is contained in:
Stephan Kulow 2010-03-16 15:57:40 +00:00 committed by Git OBS Bridge
parent d562870db0
commit 384097f03a
4 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ARM_kexec-zImage-arm_page_to_unistd.diff
View File

@ -1,12 +0,0 @@
diff -Napur _orig//kexec/arch/arm/kexec-zImage-arm.c kexec-tools-2.0.0//kexec/arch/arm/kexec-zImage-arm.c
--- _orig//kexec/arch/arm/kexec-zImage-arm.c 2008-07-14 13:28:19.000000000 +0200
+++ kexec-tools-2.0.0//kexec/arch/arm/kexec-zImage-arm.c 2009-09-21 15:10:48.946616398 +0200
@@ -11,7 +11,7 @@
#include <stdint.h>
#include <getopt.h>
#include <arch/options.h>
-#include <asm/page.h>
+#include <unistd.h>
#include "../../kexec.h"
#define COMMAND_LINE_SIZE 1024

37
kexec-tools-xen-static.diff
View File

@ -7,13 +7,36 @@ to use Xen support without a runtime dependency to the Xen package.
Signed-off-by: Bernhard Walle <bwalle@suse.de>
---
configure.ac | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,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,

6
kexec-tools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

4
kexec-tools.spec
View File

@ -38,7 +38,6 @@ Source4: %{name}-%{version}-rpmlintrc
Patch0: %{name}-no-vga-output.diff
Patch1: %{name}-xen-static.diff
Patch2: %{name}-increase-kernel-text-size.diff
Patch500: ARM_kexec-zImage-arm_page_to_unistd.diff
Url: http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!BuildIgnore: fop
@ -73,7 +72,6 @@ Authors:
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch500 -p1
%build
# disable as-needed
@ -82,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=/ \