1 files changed, 32 insertions, 19 deletions

diff --git a/recipes-connectivity/openssl/openssl-qoriq_1.0.2k.bb b/recipes-connectivity/openssl/openssl-qoriq_1.0.2k.bb
index 9ba150ad..c7064977 100644
--- a/recipes-connectivity/openssl/openssl-qoriq_1.0.2k.bb
+++ b/recipes-connectivity/openssl/openssl-qoriq_1.0.2k.bb
@@ -1,36 +1,56 @@
 require openssl-qoriq.inc
 
-
 DISABLE_STATIC = ""
+# For target side versions of openssl enable support for OCF Linux driver
+# if they are available.
 DEPENDS += "cryptodev-linux"
-RRECOMMENDS_libcrypto += "cryptodev-module"
+
 CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
-COMPATIBLE_MACHINE = "(qoriq)"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=27ffa5d74bb5a337056c14b2ef93fbf6"
 
 export DIRS = "crypto ssl apps engines"
 export OE_LDFLAGS="${LDFLAGS}"
 
-SRC_URI += "file://find.pl \
+SRC_URI += "file://find.pl;subdir=${BP}/util/ \
             file://run-ptest \
+            file://openssl-c_rehash.sh \
             file://configure-targets.patch \
             file://shared-libs.patch \
             file://oe-ldflags.patch \
             file://engines-install-in-libdir-ssl.patch \
             file://debian1.0.2/block_diginotar.patch \
             file://debian1.0.2/block_digicert_malaysia.patch \
-            file://no-rpath.patch \
+            file://debian/ca.patch \
+            file://debian/c_rehash-compat.patch \
+            file://debian/debian-targets.patch \
+            file://debian/man-dir.patch \
+            file://debian/man-section.patch \
+            file://debian/no-rpath.patch \
+            file://debian/no-symbolic.patch \
+            file://debian/pic.patch \
+            file://debian1.0.2/version-script.patch \
+            file://debian1.0.2/soname.patch \
             file://openssl_fix_for_x32.patch \
             file://fix-cipher-des-ede3-cfb1.patch \
+            file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
             file://openssl-fix-des.pod-error.patch \
             file://Makefiles-ptest.patch \
             file://ptest-deps.patch \
-            file://crypto_use_bigint_in_x86-64_perl.patch \
             file://openssl-1.0.2a-x32-asm.patch \
-            file://ptest_makefile_deps.patch  \
-           "
-SRC_URI += "file://0001-remove-double-initialization-of-cryptodev-engine.patch \
+            file://ptest_makefile_deps.patch \
+            file://configure-musl-target.patch \
+            file://parallel.patch \
+            file://openssl-util-perlpath.pl-cwd.patch \
+            file://Use-SHA256-not-MD5-as-default-digest.patch \
+            file://0001-Fix-build-with-clang-using-external-assembler.patch \
+            "
+SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
+SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
+
+SRC_URI += " \
+    file://find.pl;subdir=openssl-${PV}/util/ \
+    file://0001-remove-double-initialization-of-cryptodev-engine.patch \
         file://0002-eng_cryptodev-add-support-for-TLS-algorithms-offload.patch \
         file://0003-cryptodev-fix-algorithm-registration.patch \
         file://0004-ECC-Support-header-for-Cryptodev-Engine.patch \
@@ -80,16 +100,8 @@ SRC_URI += "file://0001-remove-double-initialization-of-cryptodev-engine.patch \
         file://0048-fix-maclen-is-used-uninitialized-warning-on-some-com.patch \
 "
 
-SRC_URI[md5sum] = "f965fc0bf01bf882b31314b61391ae65"
-SRC_URI[sha256sum] = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"
-
-PACKAGES =+ " \
-        ${PN}-engines \
-        ${PN}-engines-dbg \
-        "
-
+PACKAGES =+ "${PN}-engines"
 FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines"
-FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
 
 # The crypto_use_bigint patch means that perl's bignum module needs to be
 # installed, but some distributions (for example Fedora 23) don't ship it by
@@ -99,5 +111,6 @@ do_configure_prepend() {
         if ! perl -Mbigint -e true; then
                 bbfatal "The perl module 'bignum' was not found but this is required to build openssl.  Please install this module (often packaged as perl-bignum) and re-run bitbake."
         fi
-        cp ${WORKDIR}/find.pl ${S}/util/find.pl
 }
+
+COMPATIBLE_MACHINE = "(qoriq)"