From a9cfdb74aba4185c01bd86c01c880bf83ca8f4f69ccee8f0d3c6ee24fad7c1b1 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Tue, 10 May 2016 20:52:19 +0000 Subject: [PATCH] Accepting request 394655 from home:olh:branches:Kernel:kdump - 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 --- kexec-tools-xen-static.patch | 17 +++++++++++++---- kexec-tools.changes | 5 +++++ kexec-tools.spec | 3 ++- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/kexec-tools-xen-static.patch b/kexec-tools-xen-static.patch index 6293096..07841d8 100644 --- a/kexec-tools-xen-static.patch +++ b/kexec-tools-xen-static.patch @@ -9,18 +9,27 @@ Signed-off-by: Bernhard Walle ================================================================================ --- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + configure.ac | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) --- a/configure.ac +++ b/configure.ac -@@ -164,7 +164,8 @@ fi +@@ -163,9 +163,17 @@ fi + dnl find Xen control stack libraries if test "$with_xen" = yes ; then ++ if pkg-config --exists 'xenlight > 4.6' ; 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 -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]))]) ++ 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 + dnl ---Sanity checks diff --git a/kexec-tools.changes b/kexec-tools.changes index 26c91c6..f0083a2 100644 --- a/kexec-tools.changes +++ b/kexec-tools.changes @@ -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 diff --git a/kexec-tools.spec b/kexec-tools.spec index df56f48..e342f72 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -50,6 +50,7 @@ BuildRequires: automake BuildRequires: libxslt BuildRequires: zlib-devel %ifarch x86_64 +BuildRequires: pkg-config BuildRequires: xen-devel %endif ExclusiveArch: ppc64le aarch64 %ix86 x86_64 ia64 ppc ppc64 s390 s390x %arm sh mips mipsel m68k