pool/kexec-tools
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 394655 from home:olh:branches:Kernel:kdump

Browse Source 
- Adjust linking to libxenctrl to xen-4.7 API

OBS-URL: https://build.opensuse.org/request/show/394655
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=70
This commit is contained in:
Tony Jones 2016-05-10 20:52:19 +00:00 committed by Git OBS Bridge
parent 5905ad3780
commit a9cfdb74ab
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kexec-tools-xen-static.patch
View File

@ -9,18 +9,27 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de>
================================================================================ ================================================================================
--- ---
configure.ac | 3 ++- configure.ac | 10 +++++++++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 9 insertions(+), 1 deletion(-)
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -164,7 +164,8 @@ fi @@ -163,9 +163,17 @@ fi
dnl find Xen control stack libraries dnl find Xen control stack libraries
if test "$with_xen" = yes ; then if test "$with_xen" = yes ; then
+ if pkg-config --exists 'xenlight > 4.6' ; then
AC_CHECK_HEADER(xenctrl.h, AC_CHECK_HEADER(xenctrl.h,
- [AC_CHECK_LIB(xenctrl, xc_kexec_load, , - [AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
+ [AC_CHECK_LIB(xenctrl, xc_kexec_load, + [AC_CHECK_LIB(xenctrl, xc_kexec_load,
+ [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]], + [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
AC_MSG_NOTICE([Xen support disabled]))]) AC_MSG_NOTICE([Xen support disabled]))])
+ else
+ AC_CHECK_HEADER(xenctrl.h,
+ [AC_CHECK_LIB(xenctrl, xc_kexec_load,
+ [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
+ AC_MSG_NOTICE([Xen support disabled]))])
+ fi
fi fi
dnl ---Sanity checks

5
kexec-tools.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 3 15:17:15 UTC 2016 - olaf@aepfle.de
- Adjust linking to libxenctrl to xen-4.7 API
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 10 16:33:20 CET 2015 - tiwai@suse.de Thu Dec 10 16:33:20 CET 2015 - tiwai@suse.de

3
kexec-tools.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package kexec-tools # spec file for package kexec-tools
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -50,6 +50,7 @@ BuildRequires: automake
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: zlib-devel BuildRequires: zlib-devel
%ifarch x86_64 %ifarch x86_64
BuildRequires: pkg-config
BuildRequires: xen-devel BuildRequires: xen-devel
%endif %endif
ExclusiveArch: ppc64le aarch64 %ix86 x86_64 ia64 ppc ppc64 s390 s390x %arm sh mips mipsel m68k ExclusiveArch: ppc64le aarch64 %ix86 x86_64 ia64 ppc ppc64 s390 s390x %arm sh mips mipsel m68k