forked from pool/kexec-tools
080f64dafa
- Update to version 2.0.14 (bsc#1039937, FATE#320672, FATE#320671) Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.13..v2.0.14 - Backport upstream fixes (bsc#1039937, FATE#320672, FATE#320671) 0001-kexec-tools-2.0.14.git.patch 0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch 0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch 0004-alpha-add-missing-__NR_kexec_load-definition.patch 0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch 0006-kexec-Remove-redundant-space-from-help-message.patch 0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch 0008-kexec-Add-option-to-get-crash-kernel-region-size.patch 0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch 0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch 0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch 0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch 0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch 0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch 0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch 0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch 0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch 0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch 0019-gitignore-add-two-generated-files-in-purgatory.patch 0020-Only-print-debug-message-when-failed-to-serach-for-k.patch 0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch 0022-uImage-fix-realloc-pointer-confusion.patch 0023-uImage-Fix-uImage_load-for-little-endian-machines.patch 0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0027-arm64-add-uImage-support.patch OBS-URL: https://build.opensuse.org/request/show/500203 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=83
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From: Bernhard Walle <bwalle@suse.de>
|
|
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
|
|
to use Xen support without a runtime dependency to the Xen package.
|
|
|
|
Signed-off-by: Bernhard Walle <bwalle@suse.de>
|
|
|
|
================================================================================
|
|
---
|
|
configure.ac | 17 ++++++++++++++++-
|
|
1 file changed, 16 insertions(+), 1 deletion(-)
|
|
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -164,8 +164,10 @@ fi
|
|
|
|
dnl find Xen control stack libraries
|
|
if test "$with_xen" = yes ; 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 -lxendevicemodel -lxenforeignmemory -Wl,-Bdynamic -lpthread -ldl $LIBS"]],
|
|
AC_MSG_NOTICE([Xen support disabled]))])
|
|
if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then
|
|
AC_CHECK_LIB(xenctrl, xc_kexec_status,
|
|
@@ -173,6 +175,19 @@ if test "$with_xen" = yes ; then
|
|
[The kexec_status call is available]),
|
|
AC_MSG_NOTICE([The kexec_status call is not available]))
|
|
fi
|
|
+ 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_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
|