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

Accepting request 537944 from Virtualization

Browse Source 
Xen 4.10 breaks kexec-tools build (bsc#1037779)

OBS-URL: https://build.opensuse.org/request/show/537944
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=87
This commit is contained in:
Tony Jones 2017-10-31 18:47:43 +00:00 committed by Git OBS Bridge
parent ca0eb86a5d
commit 00fa134abf
3 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kexec-tools-disable-test.patch
View File

@ -8,9 +8,11 @@ Fedora). Also one less file for usr_merge
Makefile.in | 7 +++++-- Makefile.in | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-) 1 file changed, 5 insertions(+), 2 deletions(-)
--- a/Makefile.in Index: kexec-tools-2.0.14/Makefile.in
+++ b/Makefile.in ===================================================================
@@ -177,8 +177,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N --- kexec-tools-2.0.14.orig/Makefile.in
+++ kexec-tools-2.0.14/Makefile.in
@@ -178,8 +178,11 @@ PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_N
PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s))
MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE) MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE)

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

@ -6,42 +6,60 @@ 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.
31Oct2017: Updated to handle Xen 4.10 with new xentoolcore library
Signed-off-by: Bernhard Walle <bwalle@suse.de> Signed-off-by: Bernhard Walle <bwalle@suse.de>
Signed-off-by: Charles Arnold <carnold@suse.com>
================================================================================ ================================================================================
--- ---
configure.ac | 17 ++++++++++++++++- configure.ac | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-) 1 file changed, 16 insertions(+), 1 deletion(-)
--- a/configure.ac Index: kexec-tools-2.0.14/configure.ac
+++ b/configure.ac ===================================================================
--- kexec-tools-2.0.14.orig/configure.ac
+++ kexec-tools-2.0.14/configure.ac
@@ -164,8 +164,10 @@ fi @@ -164,8 +164,10 @@ 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.8.0' ; then + if pkg-config --exists 'xenlight > 4.9.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 -lxendevicemodel -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]], + [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -lxencall -lxentoolcore -lxentoollog -lxendevicemodel -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
AC_MSG_NOTICE([Xen support disabled]))]) AC_MSG_NOTICE([Xen support disabled]))])
if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then
AC_CHECK_LIB(xenctrl, xc_kexec_status, AC_CHECK_LIB(xenctrl, xc_kexec_status,
@@ -173,6 +175,19 @@ if test "$with_xen" = yes ; then @@ -173,6 +175,32 @@ if test "$with_xen" = yes ; then
[The kexec_status call is available]), [The kexec_status call is available]),
AC_MSG_NOTICE([The kexec_status call is not available])) AC_MSG_NOTICE([The kexec_status call is not available]))
fi fi
+ else + else
+ if pkg-config --exists 'xenlight > 4.6.0' ; 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_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]))])
+ if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then
+ AC_CHECK_LIB(xenctrl, xc_kexec_status,
+ AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1,
+ [The kexec_status call is available]),
+ AC_MSG_NOTICE([The kexec_status call is not available]))
+ fi
+ else + else
+ AC_CHECK_HEADER(xenctrl.h, + if pkg-config --exists 'xenlight > 4.6.0' ; then
+ [AC_CHECK_LIB(xenctrl, xc_kexec_load, + AC_CHECK_HEADER(xenctrl.h,
+ [AC_DEFINE([HAVE_LIBXENCTRL], [1], [libxenctrl]) [LIBS="-Wl,-Bstatic -lxenctrl -Wl,-Bdynamic -lpthread -ldl $LIBS"]], + [AC_CHECK_LIB(xenctrl, xc_kexec_load,
+ AC_MSG_NOTICE([Xen support disabled]))]) + [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
+ fi + fi
fi fi

8
kexec-tools.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Oct 31 10:23:51 MDT 2017 - carnold@suse.com
- With Xen 4.10 there is a new required library called xentoolcore
(bsc#1037779)
kexec-tools-xen-static.patch
- Refreshed kexec-tools-disable-test.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 1 09:12:40 UTC 2017 - jengelh@inai.de Thu Jun 1 09:12:40 UTC 2017 - jengelh@inai.de