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-14 22:26:10 +0000 |
| commit | a831cbe6cce67396148b41d56cbc12f99a972bd1 (patch) | |
| tree | 06ecc276284c3e48456a2c66541cddb52586d539 /meta | |
| parent | 38cbca47bb6cf5bb2c399c665520c1e207eb6734 (diff) | |
| download | openembedded-core-a831cbe6cce67396148b41d56cbc12f99a972bd1.tar.gz openembedded-core-a831cbe6cce67396148b41d56cbc12f99a972bd1.tar.bz2 openembedded-core-a831cbe6cce67396148b41d56cbc12f99a972bd1.zip | |
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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta')
| -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 78ba5c8a22..6eb1b5eac9 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 2da18aead7..2bca400ee6 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 } |