- removed obsolete xen patch; release 2

diff --git a/kexec-tools-xen.patch b/kexec-tools-xen.patch
deleted file mode 100644 (file)
index 70c59f0..0000000
--- a/kexec-tools-xen.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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 d7899b28372ffaa1014895f12b7a09c026e953ea..a57da4b5a08b2d87fdb1a987c0e7c5fe6f0d9bff 100644 (file)
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -12,16 +12,15 @@ 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.21
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.xz
 # Source0-md5: 4a0bbced84e46162d8f8e2c17a0b1466
 Source1:       kexec.init
 Source2:       kexec.sysconfig
-Patch0:                %{name}-xen.patch
 # from http://patchwork.openembedded.org/patch/90971/raw/ (stripped to remaining syscall part)
-Patch1:                %{name}-x32.patch
+Patch0:                %{name}-x32.patch
 URL:           https://www.kernel.org/pub/linux/utils/kernel/kexec/
 BuildRequires: autoconf >= 2.50
 BuildRequires: rpmbuild(macros) >= 1.228
@@ -52,7 +51,6 @@ działać na każdej architekturze.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__autoconf}