public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kexectools: 2.0.13 -> 2.0.14

Browse Source 
ARM patch is included upstream now.
This commit is contained in:
Tuomas Tynkkynen 2016-12-26 18:54:34 +02:00
parent 2876b31ed5
commit e60bb86d00
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/os-specific/linux/kexectools/arm.patch
View File

@ -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

6
pkgs/os-specific/linux/kexectools/default.nix
View File

@ -2,18 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kexec-tools-${version}"; name = "kexec-tools-${version}";
version = "2.0.13"; version = "2.0.14";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
"http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
]; ];
sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7"; sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz";
}; };
patches = [ ./arm.patch ];
hardeningDisable = [ "format" "pic" "relro" ]; hardeningDisable = [ "format" "pic" "relro" ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];