From df3b0c42e6aaa4e68eb94b883ad3b582bd2cb85da0b7ad339fe355e0d21b1d04 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Mon, 22 May 2017 15:19:36 +0000 Subject: [PATCH] Accepting request 496869 from Virtualization 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 --- kexec-tools-xen-static.patch | 30 ++++++++++++++++++++---------- kexec-tools.changes | 7 +++++++ 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/kexec-tools-xen-static.patch b/kexec-tools-xen-static.patch index 5098056..451ab66 100644 --- a/kexec-tools-xen-static.patch +++ b/kexec-tools-xen-static.patch @@ -1,10 +1,11 @@ From: Bernhard Walle Subject: [PATCH] Link xenctrl statically +Upstream: no +Signed-off-by: Tony Jones This patch just links the xenctrl library statically. That allows to use Xen support without a runtime dependency to the Xen package. - Signed-off-by: Bernhard Walle ================================================================================ @@ -12,23 +13,32 @@ Signed-off-by: Bernhard Walle configure.ac | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---- a/configure.ac -+++ b/configure.ac -@@ -163,9 +163,17 @@ fi +Index: kexec-tools-2.0.13/configure.ac +=================================================================== +--- 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 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_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]))]) + 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]))]) ++ 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_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 diff --git a/kexec-tools.changes b/kexec-tools.changes index d77f61e..1bbfe07 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -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