- updated to 2.0.11

- added xen patch (fixes build with xen (4.6) headers)

diff --git a/kexec-tools-xen.patch b/kexec-tools-xen.patch
new file mode 100644 (file)
index 0000000..70c59f0
--- /dev/null
+++ b/kexec-tools-xen.patch
@@ -0,0 +1,25 @@
+--- kexec-tools-2.0.11/include/x86/x86-linux.h.orig    2015-09-02 03:03:16.000000000 +0200
++++ kexec-tools-2.0.11/include/x86/x86-linux.h 2016-01-18 21:53:37.749365567 +0100
+@@ -21,9 +21,11 @@ struct e820entry {
+ #define E820_RESERVED 2
+ #define E820_ACPI     3 /* usable as RAM once ACPI tables have been read */
+ #define E820_NVS      4
++} __attribute__((packed));
++#endif
++#ifndef E820_PMEM
+ #define E820_PMEM       7
+ #define E820_PRAM       12
+-} __attribute__((packed));
+ #endif
+ 
+ /* FIXME expand on drive_info_)struct... */
+--- kexec-tools-2.0.11/kexec/arch/i386/kexec-x86-common.c.orig 2015-10-06 10:53:46.000000000 +0200
++++ kexec-tools-2.0.11/kexec/arch/i386/kexec-x86-common.c      2016-01-18 21:53:12.732699950 +0100
+@@ -43,6 +43,7 @@
+ #ifdef HAVE_LIBXENCTRL
+ #include <xenctrl.h>
+ #endif /* HAVE_LIBXENCTRL */
++#include "x86/x86-linux.h"
+ 
+ static struct memory_range memory_range[MAX_MEMORY_RANGES];
+ 

diff --git a/kexec-tools.spec b/kexec-tools.spec
index b46cf19ce5b3af4d35e53a81a2c07b86544e1c8c..73202d4f77f52523f26fb8c2d121ad126996248c 100644 (file)
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -7,15 +7,16 @@
 Summary:       Tool for starting new kernel without reboot
 Summary(pl.UTF-8):     Narzędzie pozwalające załadować nowe jądro bez konieczności restartu
 Name:          kexec-tools
-Version:       2.0.10
+Version:       2.0.11
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
-# Source0-md5: 70c7e63af2274e040812b243c26ccac8
+# Source0-md5: 062f74b1a530a5d1b2dcaef985f1a9ff
 Source1:       kexec.init
 Source2:       kexec.sysconfig
 Patch0:                %{name}-format.patch
+Patch1:                %{name}-xen.patch
 URL:           https://www.kernel.org/pub/linux/utils/kernel/kexec/
 BuildRequires: autoconf >= 2.50
 BuildRequires: rpmbuild(macros) >= 1.228
@@ -46,6 +47,7 @@ działać na każdej architekturze.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__autoconf}