mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
|
|
||
|
|
From Yang Shi <>
|
||
|
|
Subject [PATCH] crypto: rsa - fix a potential race condition in build
|
||
|
|
Date Fri, 2 Dec 2016 15:41:04 -0800
|
||
|
|
|
||
|
|
|
||
|
|
When building kernel with RSA enabled with multithreaded, the below
|
||
|
|
compile failure might be caught:
|
||
|
|
|
||
|
|
| /buildarea/kernel-source/crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file or directory
|
||
|
|
| #include "rsapubkey-asn1.h"
|
||
|
|
| ^
|
||
|
|
| compilation terminated.
|
||
|
|
| CC crypto/rsa-pkcs1pad.o
|
||
|
|
| CC crypto/algboss.o
|
||
|
|
| CC crypto/testmgr.o
|
||
|
|
| make[3]: *** [/buildarea/kernel-source/scripts/Makefile.build:289: crypto/rsa_helper.o] Error 1
|
||
|
|
| make[3]: *** Waiting for unfinished jobs....
|
||
|
|
| make[2]: *** [/buildarea/kernel-source/Makefile:969: crypto] Error 2
|
||
|
|
| make[1]: *** [Makefile:150: sub-make] Error 2
|
||
|
|
| make: *** [Makefile:24: __sub-make] Error 2
|
||
|
|
|
||
|
|
The header file is not generated before rsa_helper is compiled, so
|
||
|
|
adding dependency to avoid such issue.
|
||
|
|
|
||
|
|
Signed-off-by: Yang Shi <yang.shi@windriver.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
crypto/Makefile | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/crypto/Makefile b/crypto/Makefile
|
||
|
|
index 99cc64a..8db39f9 100644
|
||
|
|
--- a/crypto/Makefile
|
||
|
|
+++ b/crypto/Makefile
|
||
|
|
@@ -40,6 +40,7 @@ obj-$(CONFIG_CRYPTO_ECDH) += ecdh_generic.o
|
||
|
|
|
||
|
|
$(obj)/rsapubkey-asn1.o: $(obj)/rsapubkey-asn1.c $(obj)/rsapubkey-asn1.h
|
||
|
|
$(obj)/rsaprivkey-asn1.o: $(obj)/rsaprivkey-asn1.c $(obj)/rsaprivkey-asn1.h
|
||
|
|
+$(obj)/rsa_helper.o: $(obj)/rsa_helper.c $(obj)/rsaprivkey-asn1.h
|
||
|
|
clean-files += rsapubkey-asn1.c rsapubkey-asn1.h
|
||
|
|
clean-files += rsaprivkey-asn1.c rsaprivkey-asn1.h
|
||
|
|
|
||
|
|
--
|
||
|
|
2.0.2
|