From e60bb86d00d49451e18a8181a5aa1276f899b8d2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 26 Dec 2016 18:54:34 +0200
Subject: [PATCH] kexectools: 2.0.13 -> 2.0.14

ARM patch is included upstream now.
---
 pkgs/os-specific/linux/kexectools/arm.patch   | 28 -------------------
 pkgs/os-specific/linux/kexectools/default.nix |  6 ++--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kexectools/arm.patch

diff --git a/pkgs/os-specific/linux/kexectools/arm.patch b/pkgs/os-specific/linux/kexectools/arm.patch
deleted file mode 100644
index 9c1d482c81ad..000000000000
--- a/pkgs/os-specific/linux/kexectools/arm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream kexec-tools 2.0.13 does not pack arm phys_to_virt.h and iomem.h,
-include them here for a temporary fix
-
-diff -uprN kexec-tools/kexec/arch/arm/iomem.h kexec-tools.1/kexec/arch/arm/iomem.h
---- kexec-tools/kexec/arch/arm/iomem.h	1970-01-01 08:00:00.000000000 +0800
-+++ kexec-tools.1/kexec/arch/arm/iomem.h	2016-08-09 15:38:26.938594379 +0800
-@@ -0,0 +1,9 @@
-+#ifndef IOMEM_H
-+#define IOMEM_H
-+
-+#define SYSTEM_RAM		"System RAM\n"
-+#define SYSTEM_RAM_BOOT		"System RAM (boot alias)\n"
-+#define CRASH_KERNEL		"Crash kernel\n"
-+#define CRASH_KERNEL_BOOT	"Crash kernel (boot alias)\n"
-+
-+#endif
-diff -uprN kexec-tools/kexec/arch/arm/phys_to_virt.h kexec-tools.1/kexec/arch/arm/phys_to_virt.h
---- kexec-tools/kexec/arch/arm/phys_to_virt.h	1970-01-01 08:00:00.000000000 +0800
-+++ kexec-tools.1/kexec/arch/arm/phys_to_virt.h	2016-08-09 14:50:30.104143361 +0800
-@@ -0,0 +1,8 @@
-+#ifndef PHYS_TO_VIRT_H
-+#define PHYS_TO_VIRT_H
-+
-+#include <stdint.h>
-+
-+extern uint64_t phys_offset;
-+
-+#endif
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index cd2833617b92..206dc6889e8b 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -2,18 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "kexec-tools-${version}";
-  version = "2.0.13";
+  version = "2.0.14";
 
   src = fetchurl {
     urls = [
       "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
       "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
     ];
-    sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7";
+    sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz";
   };
 
-  patches = [ ./arm.patch ];
-
   hardeningDisable = [ "format" "pic" "relro" ];
 
   buildInputs = [ zlib ];