MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

linux kernel 4.4: fix race during build

Browse source 
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
This commit is contained in:
obadz 2016-04-12 19:30:14 +01:00
parent 860aa01782
commit 4788ec1372
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/patches.nix
View file

@ -154,4 +154,8 @@ rec {
{ name = "mfd_fix_dependency"; { name = "mfd_fix_dependency";
patch = ./chromiumos-patches/mfd-fix-dependency.patch; patch = ./chromiumos-patches/mfd-fix-dependency.patch;
}; };
qat_common_Makefile =
{ name = "qat_common_Makefile";
patch = ./qat_common_Makefile.patch;
};
} }

10
pkgs/os-specific/linux/kernel/qat_common_Makefile.patch Normal file
View file

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

2
pkgs/top-level/all-packages.nix
View file

@ -10450,7 +10450,7 @@ in
}; };
linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { 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") ++ lib.optionals ((platform.kernelArch or null) == "mips")
[ kernelPatches.mips_fpureg_emu [ kernelPatches.mips_fpureg_emu
kernelPatches.mips_fpu_sigill kernelPatches.mips_fpu_sigill