From: Cristian Stoica <cristian.stoica@freescale.com>
Date: Fri, 17 Jul 2015 09:29:42 +0000 (+0800)
Subject: openssl: rewrite recipe to remove code duplication
X-Git-Tag: 2.1~487
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=60c02656fe24cc0a149f0c485dd67fc7a29b3cd6;p=meta-freescale.git

openssl: rewrite recipe to remove code duplication

- the package is now based on upstream tarball instead of Freescale git
  repository
- Freescale cryptodev patches are applied only on target package to
  avoid build errors

Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-ppc/recipes-connectivity/openssl/openssl_1.0.1i.bb b/meta-fsl-ppc/recipes-connectivity/openssl/openssl_1.0.1i.bb
index 54c052ef..9d093efe 100644
--- a/meta-fsl-ppc/recipes-connectivity/openssl/openssl_1.0.1i.bb
+++ b/meta-fsl-ppc/recipes-connectivity/openssl/openssl_1.0.1i.bb
@@ -26,7 +26,6 @@ SRC_URI += "file://configure-targets.patch \
             file://debian/no-symbolic.patch \
             file://debian/debian-targets.patch \
             file://openssl_fix_for_x32.patch \
-            file://openssl-fix-doc.patch \
             file://fix-cipher-des-ede3-cfb1.patch \
             file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
             file://openssl-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
@@ -35,8 +34,8 @@ SRC_URI += "file://configure-targets.patch \
             file://openssl-fix-des.pod-error.patch \
            "
 
-SRC_URI[md5sum] = "de62b43dfcd858e66a74bee1c834e959"
-SRC_URI[sha256sum] = "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028"
+SRC_URI[md5sum] = "c8dc151a671b9b92ff3e4c118b174972"
+SRC_URI[sha256sum] = "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"
 
 PACKAGES =+ " \
         ${PN}-engines-dbg \
diff --git a/meta-fsl-ppc/recipes-connectivity/openssl/openssl_1.0.1i.bbappend b/meta-fsl-ppc/recipes-connectivity/openssl/openssl_1.0.1i.bbappend
index 89d7339a..2fa098fd 100644
--- a/meta-fsl-ppc/recipes-connectivity/openssl/openssl_1.0.1i.bbappend
+++ b/meta-fsl-ppc/recipes-connectivity/openssl/openssl_1.0.1i.bbappend
@@ -2,10 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/openssl-fsl:"
 
 RDEPENDS_${PN}_class-target += "cryptodev-module"
 
-# base package is taken from Freescale repository
-SRCBRANCH = "OpenSSL_1_0_1-stable"
-SRC_URI = "git://git.openssl.org/openssl.git;branch=${SRCBRANCH} \
-	file://0001-remove-double-initialization-of-cryptodev-engine.patch \
+SRC_URI_append_class-target = " 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-linux-pcc-make-it-more-robust-and-recognize-KERNEL_B.patch \
@@ -23,33 +20,6 @@ SRC_URI = "git://git.openssl.org/openssl.git;branch=${SRCBRANCH} \
 	file://0016-Fixed-DH-keygen-pair-generator.patch \
 	file://0017-cryptodev-add-support-for-aes-gcm-algorithm-offloadi.patch \
 "
-SRCREV = "2b456034457b58454aae3998a2765b6a5b9bc837"
-
-SRC_URI += "file://configure-targets.patch \
-            file://shared-libs.patch \
-            file://oe-ldflags.patch \
-            file://engines-install-in-libdir-ssl.patch \
-            file://openssl-fix-link.patch \
-            file://debian/version-script.patch \
-            file://debian/pic.patch \
-            file://debian/c_rehash-compat.patch \
-            file://debian/ca.patch \
-            file://debian/make-targets.patch \
-            file://debian/no-rpath.patch \
-            file://debian/man-dir.patch \
-            file://debian/man-section.patch \
-            file://debian/no-symbolic.patch \
-            file://debian/debian-targets.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-avoid-NULL-pointer-dereference-in-dh_pub_encode.patch \
-            file://initial-aarch64-bits.patch \
-            file://find.pl \
-            file://openssl-fix-des.pod-error.patch \
-           "
-S = "${WORKDIR}/git"
-
 # Digest offloading through cryptodev is not recommended because of the
 # performance penalty of the Openssl engine interface. Openssl generates a huge
 # number of calls to digest functions for even a small amount of work data.
@@ -57,4 +27,4 @@ S = "${WORKDIR}/git"
 # when downloading only 10 files of 700 bytes each.
 # Do not build OpenSSL with cryptodev digest support until engine digest
 # interface gets some rework:
-CFLAG := "${@'${CFLAG}'.replace('-DUSE_CRYPTODEV_DIGESTS', '')}"
+CFLAG_class-target := "${@'${CFLAG}'.replace('-DUSE_CRYPTODEV_DIGESTS', '')}"