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>

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index 78ba5c8a2270d693695d93360d308f2dbe0a73e0..6eb1b5eac9982e266557dc9217782ffe203dae4b 100644 (file)
--- 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 2da18aead7bb322ed2f2f07897c7d1578f967e45..2bca400ee6b51e28e8c17e10758469c04b22b7c8 100644 (file)
--- 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
 }