From a831cbe6cce67396148b41d56cbc12f99a972bd1 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 29 Jan 2015 17:33:35 -0800 Subject: 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 --- meta/recipes-connectivity/openssl/openssl.inc | 3 +++ meta/recipes-connectivity/openssl/openssl_1.0.1j.bb | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') 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 } -- cgit v1.2.3