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

Accepting request 496869 from Virtualization

Browse Source 
Fix for bsc#1037779 - xen breaks kexec-tools build

OBS-URL: https://build.opensuse.org/request/show/496869
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=81
This commit is contained in:
Tony Jones 2017-05-22 15:19:36 +00:00 committed by Git OBS Bridge
parent ad796763fc
commit df3b0c42e6
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,11 @@
From: Bernhard Walle <bwalle@suse.de> From: Bernhard Walle <bwalle@suse.de>
Subject: [PATCH] Link xenctrl statically Subject: [PATCH] Link xenctrl statically
Upstream: no
Signed-off-by: Tony Jones <tonyj@suse.de>
This patch just links the xenctrl library statically. That allows This patch just links the xenctrl library statically. That allows
to use Xen support without a runtime dependency to the Xen package. to use Xen support without a runtime dependency to the Xen package.
Signed-off-by: Bernhard Walle <bwalle@suse.de> Signed-off-by: Bernhard Walle <bwalle@suse.de>
================================================================================ ================================================================================
@ -12,23 +13,32 @@ Signed-off-by: Bernhard Walle <bwalle@suse.de>
configure.ac | 10 +++++++++- configure.ac | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-) 1 file changed, 9 insertions(+), 1 deletion(-)
--- a/configure.ac Index: kexec-tools-2.0.13/configure.ac
+++ b/configure.ac ===================================================================
@@ -163,9 +163,17 @@ fi --- kexec-tools-2.0.13.orig/configure.ac
+++ kexec-tools-2.0.13/configure.ac
@@ -161,9 +161,24 @@ 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.7' ; then + if pkg-config --exists 'xenlight > 4.8.0' ; 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 -lxencall -lxentoollog -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]], + [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxendevicemodel -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
AC_MSG_NOTICE([Xen support disabled]))]) AC_MSG_NOTICE([Xen support disabled]))])
+ else + else
+ if pkg-config --exists 'xenlight > 4.6.0' ; then
+ AC_CHECK_HEADER(xenctrl.h,
+ [AC_CHECK_LIB(xenctrl, xc_kexec_load,
+ [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoollog -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
+ AC_MSG_NOTICE([Xen support disabled]))])
+ else
+ 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_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]], + [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
+ AC_MSG_NOTICE([Xen support disabled]))]) + AC_MSG_NOTICE([Xen support disabled]))])
+ fi
+ fi + fi
fi fi

7
kexec-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 10 15:51:43 MDT 2017 - carnold@suse.com
- kexec-tools-xen-static.patch: xen breaks kexec-tools build
(bsc#1037779)
See also matching fix in xen-devel package
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 11 14:27:09 UTC 2017 - bwiedemann@suse.com Tue Apr 11 14:27:09 UTC 2017 - bwiedemann@suse.com