summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-29 17:33:35 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:27 +0000
commit7502fa5febdd7a2281d626f7040782fb1f9af59e (patch)
tree33a5a9a15fd8b4f285ca39d6fbdaacf5ce415129 /meta
parent60b33e5b93b7c5189b9fdb8ac27646bf80bac382 (diff)
downloadpoky-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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc3
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.1j.bb3
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 () {
155} 155}
156 156
157do_install () { 157do_install () {
158 # Create ${D}/${prefix} to fix parallel issues
159 mkdir -p ${D}/${prefix}/
160
158 oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install 161 oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install
159 162
160 oe_libinstall -so libcrypto ${D}${libdir} 163 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 =+ " \
49FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" 49FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
50FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug" 50FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
51 51
52PARALLEL_MAKE = ""
53PARALLEL_MAKEINST = ""
54
55do_configure_prepend() { 52do_configure_prepend() {
56 cp ${WORKDIR}/find.pl ${S}/util/find.pl 53 cp ${WORKDIR}/find.pl ${S}/util/find.pl
57} 54}