git.iko.soy/typeable/nixpkgs
on master help sign in
kexectools: 2.0.13 -> 2.0.14

ARM patch is included upstream now.

commite60bb86d00d49451e18a8181a5aa1276f899b8d2 authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi> dateMon 26 Dec 2016, 18:54 (10 years ago) parent2876b31
2 files changed+2−32
compare with master
unifiedsplit
pkgs/os-specific/linux/kexectools/arm.patch−28 pkgs/os-specific/linux/kexectools/default.nix+2−4
pkgs/os-specific/linux/kexectools/arm.patchdeleted−28
@@ -1,28 +0,0 @@
1−Upstream kexec-tools 2.0.13 does not pack arm phys_to_virt.h and iomem.h,
2−include them here for a temporary fix
3−
4−diff -uprN kexec-tools/kexec/arch/arm/iomem.h kexec-tools.1/kexec/arch/arm/iomem.h
5−--- kexec-tools/kexec/arch/arm/iomem.h 1970-01-01 08:00:00.000000000 +0800
6−+++ kexec-tools.1/kexec/arch/arm/iomem.h 2016-08-09 15:38:26.938594379 +0800
7−@@ -0,0 +1,9 @@
8−+#ifndef IOMEM_H
9−+#define IOMEM_H
10−+
11−+#define SYSTEM_RAM "System RAM\n"
12−+#define SYSTEM_RAM_BOOT "System RAM (boot alias)\n"
13−+#define CRASH_KERNEL "Crash kernel\n"
14−+#define CRASH_KERNEL_BOOT "Crash kernel (boot alias)\n"
15−+
16−+#endif
17−diff -uprN kexec-tools/kexec/arch/arm/phys_to_virt.h kexec-tools.1/kexec/arch/arm/phys_to_virt.h
18−--- kexec-tools/kexec/arch/arm/phys_to_virt.h 1970-01-01 08:00:00.000000000 +0800
19−+++ kexec-tools.1/kexec/arch/arm/phys_to_virt.h 2016-08-09 14:50:30.104143361 +0800
20−@@ -0,0 +1,8 @@
21−+#ifndef PHYS_TO_VIRT_H
22−+#define PHYS_TO_VIRT_H
23−+
24−+#include <stdint.h>
25−+
26−+extern uint64_t phys_offset;
27−+
28−+#endif
pkgs/os-specific/linux/kexectools/default.nix+2−4
@@ -2,18 +2,16 @@
22
33stdenv.mkDerivation rec {
44 name = "kexec-tools-${version}";
5− version = "2.0.13";
5+ version = "2.0.14";
66
77 src = fetchurl {
88 urls = [
99 "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
1010 "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
1111 ];
12− sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7";
12+ sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz";
1313 };
1414
15− patches = [ ./arm.patch ];
16−
1715 hardeningDisable = [ "format" "pic" "relro" ];
1816
1917 buildInputs = [ zlib ];