From 4788ec13725f9bcab65212057e54215d10d4ee62 Mon Sep 17 00:00:00 2001 From: obadz Date: Tue, 12 Apr 2016 19:30:14 +0100 Subject: [PATCH] linux kernel 4.4: fix race during build Patch drivers/crypto/qat/qat_common/Makefile so that qat_asym_algs.o explicitly depends on headers qat_rsaprivkey-asn1.h and qat_rsapubkey-asn1.h Hopefully fixes #14595 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++++ .../os-specific/linux/kernel/qat_common_Makefile.patch | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/qat_common_Makefile.patch diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index a23ee7823a61..707ebb544bf4 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -154,4 +154,8 @@ rec { { name = "mfd_fix_dependency"; patch = ./chromiumos-patches/mfd-fix-dependency.patch; }; + qat_common_Makefile = + { name = "qat_common_Makefile"; + patch = ./qat_common_Makefile.patch; + }; } diff --git a/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch b/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch new file mode 100644 index 000000000000..2d4476a7fe50 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/qat_common_Makefile.patch @@ -0,0 +1,10 @@ +--- a/drivers/crypto/qat/qat_common/Makefile ++++ b/drivers/crypto/qat/qat_common/Makefile +@@ -2,6 +2,7 @@ + $(obj)/qat_rsapubkey-asn1.h + $(obj)/qat_rsaprivkey-asn1.o: $(obj)/qat_rsaprivkey-asn1.c \ + $(obj)/qat_rsaprivkey-asn1.h ++$(obj)/qat_asym_algs.o: $(obj)/qat_rsaprivkey-asn1.h $(obj)/qat_rsapubkey-asn1.h + + clean-files += qat_rsapubkey-asn1.c qat_rsapubkey-asn1.h + clean-files += qat_rsaprivkey-asn1.c qat_rsapvivkey-asn1.h diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 049c185247ce..1410a50d21fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10450,7 +10450,7 @@ in }; linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill