summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kexectools/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-12-18 04:36:54 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-12-18 04:49:39 +0100
commitffe71cbe19508320ed9820e1b8caee732d5d9ddf (patch)
tree31cb96ff32c0838778fc280a26ce6948e06dbd69 /pkgs/os-specific/linux/kexectools/default.nix
parent2fe1daf804d652962aa16e765894766365ae2909 (diff)
downloadnixlib-ffe71cbe19508320ed9820e1b8caee732d5d9ddf.tar
nixlib-ffe71cbe19508320ed9820e1b8caee732d5d9ddf.tar.gz
nixlib-ffe71cbe19508320ed9820e1b8caee732d5d9ddf.tar.bz2
nixlib-ffe71cbe19508320ed9820e1b8caee732d5d9ddf.tar.lz
nixlib-ffe71cbe19508320ed9820e1b8caee732d5d9ddf.tar.xz
nixlib-ffe71cbe19508320ed9820e1b8caee732d5d9ddf.tar.zst
nixlib-ffe71cbe19508320ed9820e1b8caee732d5d9ddf.zip
kexec-tools: Add patch to fix build on ARM
Building on ARM fails with the following error:

kexec/arch/arm/phys_to_virt.o kexec/arch/arm/phys_to_virt.c
kexec/arch/arm/phys_to_virt.c:3:26: fatal error: phys_to_virt.h: No such file or directory

The patch I'm using is from Fedora:

http://pkgs.fedoraproject.org/cgit/rpms/kexec-tools.git/tree/kexec-tools-2.0.13-fix-armv7-build-failure.patch?id=97581f1a435aafa298a4d0bbcfaf40c63a41ce92

It has been reported upstream as well:

http://lists.infradead.org/pipermail/kexec/2016-September/017352.html

I'm adding the patch for all architectures, so that the next person to
upgrade kexec-tools doesn't forget that even while on x86.

Tested building with i686-linux, x86_64-linux and armv7l-linux.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/os-specific/linux/kexectools/default.nix')
-rw-r--r--pkgs/os-specific/linux/kexectools/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 1b18fb590170..cd2833617b92 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7";
   };
 
+  patches = [ ./arm.patch ];
+
   hardeningDisable = [ "format" "pic" "relro" ];
 
   buildInputs = [ zlib ];