diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-29 17:33:35 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-15 21:58:27 +0000 |
commit | 7502fa5febdd7a2281d626f7040782fb1f9af59e (patch) | |
tree | 33a5a9a15fd8b4f285ca39d6fbdaacf5ce415129 | |
parent | 60b33e5b93b7c5189b9fdb8ac27646bf80bac382 (diff) | |
download | ast2050-yocto-poky-7502fa5febdd7a2281d626f7040782fb1f9af59e.zip ast2050-yocto-poky-7502fa5febdd7a2281d626f7040782fb1f9af59e.tar.gz |
openssl: fix and enable parallel build
Fixed:
Cannot create directory image/usr: File exists
make: *** [install_sw] Error 17
Create /usr to avoid race issues.
(From OE-Core rev: a831cbe6cce67396148b41d56cbc12f99a972bd1)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 3 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.0.1j.bb | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 78ba5c8..6eb1b5e 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -155,6 +155,9 @@ do_compile_ptest () { } do_install () { + # Create ${D}/${prefix} to fix parallel issues + mkdir -p ${D}/${prefix}/ + oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install oe_libinstall -so libcrypto ${D}${libdir} diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb index 2da18ae..2bca400 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.1j.bb @@ -49,9 +49,6 @@ PACKAGES =+ " \ FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug" -PARALLEL_MAKE = "" -PARALLEL_MAKEINST = "" - do_configure_prepend() { cp ${WORKDIR}/find.pl ${S}/util/find.pl } |