diff options
author | Randy MacLeod <Randy.MacLeod@windriver.com> | 2017-10-16 11:00:45 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:33:22 +0000 |
commit | c8d5f75c87f25f84e8c6b51e616beea4e841259a (patch) | |
tree | c8c9135b3a1d6547c944b918013d91171f4022e0 /meta/recipes-connectivity/openssl/openssl_1.0.2l.bb | |
parent | 452e524ac7519e0686e9704fc9d117e23cb40da6 (diff) | |
download | poky-c8d5f75c87f25f84e8c6b51e616beea4e841259a.tar.gz |
openssl: force soft link to avoid rare race
This patch works around a rare parallel build race condition using
the force option when soft linking.
The error seen is:
ln: failed to create symbolic link 'libssl.so': File exists
make[4]: *** [Makefile.shared:171: link_a.gnu] Error 1
make[4]: Leaving directory
'/.../build/tmp-glibc/work/x86_64-linux/openssl-native/1.0.2k-r0/openssl-1.0.2k'
Just add the -f flag to the platform independent soft link code to
avoid the collision. This is reasonable since this Makefile removes
the link target before creating a new soft link. The Makefile was
written this way to support platforms that don't allow forcing a
softlink to overwrite an existing link. Only builds on Linux are
supported so that's not a requirement for oe-core recipes.
The openssl team is rewriting their build files so it's not appropriate
for openssl upstream and fixing the root cause of the race condition
was also not pursued.
(From OE-Core rev: c60288aba70635238094c6b813228b31e0715db9)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl_1.0.2l.bb')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.2l.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb index 8c34ea60e5..c537aa4cd0 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb | |||
@@ -41,6 +41,7 @@ SRC_URI += "file://find.pl;subdir=openssl-${PV}/util/ \ | |||
41 | file://openssl-util-perlpath.pl-cwd.patch \ | 41 | file://openssl-util-perlpath.pl-cwd.patch \ |
42 | file://Use-SHA256-not-MD5-as-default-digest.patch \ | 42 | file://Use-SHA256-not-MD5-as-default-digest.patch \ |
43 | file://0001-Fix-build-with-clang-using-external-assembler.patch \ | 43 | file://0001-Fix-build-with-clang-using-external-assembler.patch \ |
44 | file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ | ||
44 | " | 45 | " |
45 | SRC_URI[md5sum] = "f85123cd390e864dfbe517e7616e6566" | 46 | SRC_URI[md5sum] = "f85123cd390e864dfbe517e7616e6566" |
46 | SRC_URI[sha256sum] = "ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c" | 47 | SRC_URI[sha256sum] = "ce07195b659e75f4e1db43552860070061f156a98bb37b672b101ba6e3ddf30c" |