diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2015-03-09 10:23:31 +0100 |
|---|---|---|
| committer | Koen Kooi <koen.kooi@linaro.org> | 2015-03-09 10:23:31 +0100 |
| commit | f52378a39bc12cffc9c7564af2d51fd501b85394 (patch) | |
| tree | dc2cc1ef1c8bebf83ec4013536c35dc1cf0f5951 /meta-aarch64 | |
| parent | 46cc2c679b565388c5b1038ba23424dca5a6c7c1 (diff) | |
openssl: sync with OE-core
Merge in OE-core updates while keeping our ILP32 changes
Change-Id: I3cb680b95882c717e40042a7568ffccdf3477806
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Diffstat (limited to 'meta-aarch64')
| -rw-r--r-- | meta-aarch64/recipes-overlayed/openssl/openssl.inc | 19 | ||||
| -rw-r--r-- | meta-aarch64/recipes-overlayed/openssl/openssl_1.0.1k.bb (renamed from meta-aarch64/recipes-overlayed/openssl/openssl_1.0.1j.bb) | 4 |
2 files changed, 20 insertions, 3 deletions
diff --git a/meta-aarch64/recipes-overlayed/openssl/openssl.inc b/meta-aarch64/recipes-overlayed/openssl/openssl.inc index 925ee9ea..70af9690 100644 --- a/meta-aarch64/recipes-overlayed/openssl/openssl.inc +++ b/meta-aarch64/recipes-overlayed/openssl/openssl.inc @@ -50,6 +50,10 @@ CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf" RRECOMMENDS_libcrypto += "openssl-conf" RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc" +# Remove this to enable SSLv3. SSLv3 is defaulted to disabled due to the POODLE +# vulnerability +EXTRA_OECONF = " -no-ssl3" + do_configure_prepend_darwin () { sed -i -e '/version-script=openssl\.ld/d' Configure } @@ -117,6 +121,9 @@ do_configure () { linux-*-mips64) target=linux-mips ;; + linux-microblaze*) + target=linux-generic32 + ;; linux-powerpc) target=linux-ppc ;; @@ -155,6 +162,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} @@ -196,5 +206,12 @@ do_install_ptest () { install util/shlib_wrap.sh ${D}${PTEST_PATH}/util } -BBCLASSEXTEND = "native nativesdk" +do_install_append_virtclass-native() { + create_wrapper ${D}${bindir}/openssl \ + OPENSSL_CONF=${libdir}/ssl/openssl.cnf \ + SSL_CERT_DIR=${libdir}/ssl/certs \ + SSL_CERT_FILE=${libdir}/ssl/cert.pem \ + OPENSSL_ENGINES=${libdir}/ssl/engines +} +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-aarch64/recipes-overlayed/openssl/openssl_1.0.1j.bb b/meta-aarch64/recipes-overlayed/openssl/openssl_1.0.1k.bb index 2da18aea..16ffc58a 100644 --- a/meta-aarch64/recipes-overlayed/openssl/openssl_1.0.1j.bb +++ b/meta-aarch64/recipes-overlayed/openssl/openssl_1.0.1k.bb @@ -38,8 +38,8 @@ SRC_URI += "file://configure-targets.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "f7175c9cd3c39bb1907ac8bba9df8ed3" -SRC_URI[sha256sum] = "1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3" +SRC_URI[md5sum] = "d4f002bd22a56881340105028842ae1f" +SRC_URI[sha256sum] = "8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c" PACKAGES =+ " \ ${PN}-engines \ |