pyrox.dev
kexectools: 2.0.13 -> 2.0.14
ARM patch is included upstream now.
-28
pkgs/os-specific/linux/kexectools/arm.patch
-28
pkgs/os-specific/linux/kexectools/arm.patch
···
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
+2
-4
pkgs/os-specific/linux/kexectools/default.nix
+2
-4
pkgs/os-specific/linux/kexectools/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
name = "kexec-tools-${version}";
5
-
version = "2.0.13";
5
+
version = "2.0.14";
6
6
7
7
src = fetchurl {
8
8
urls = [
9
9
"mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
10
10
"http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
11
11
];
12
-
sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7";
12
+
sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz";
13
13
};
14
-
15
-
patches = [ ./arm.patch ];
16
14
17
15
hardeningDisable = [ "format" "pic" "relro" ];
18
16