Signed-off-by: Denys Dmytriyenko <[email protected]>
---
v2 - remove *.so in libdir, so dev packages won't clash
.../openssl/openssl10_%.bbappend | 12 ++++++++++++
.../packagegroups/packagegroup-arago-tisdk-crypto.bb | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git
a/meta-arago-distro/recipes-connectivity/openssl/openssl10_%.bbappend
b/meta-arago-distro/recipes-connectivity/openssl/openssl10_%.bbappend
index e74bcba6..21fcb3e4 100644
--- a/meta-arago-distro/recipes-connectivity/openssl/openssl10_%.bbappend
+++ b/meta-arago-distro/recipes-connectivity/openssl/openssl10_%.bbappend
@@ -13,3 +13,15 @@ CRYPTODEV_AFALG_PATCHES = " \
"
SRC_URI += "${CRYPTODEV_AFALG_PATCHES}"
+
+# override this from upstream to preserve engine libs, binaries and config
+# w/o clashing with 1.1
+openssl_package_preprocess () {
+ for file in `find ${PKGD} -name *.h -o -name *.pc`; do
+ rm $file
+ done
+ rm ${PKGD}${libdir}/*.so
+ mv ${PKGD}${bindir}/openssl ${PKGD}${bindir}/openssl10
+ mv ${PKGD}${bindir}/c_rehash ${PKGD}${bindir}/c_rehash10
+ mv ${PKGD}${sysconfdir}/ssl/openssl.cnf
${PKGD}${sysconfdir}/ssl/openssl10.cnf
+}
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
index 56e4e89e..4fe7057e 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install crypto packages into target FS"
LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -11,6 +11,8 @@ CRYPTO_SUPPORT = "\
openssl-bin \
openssl-conf \
openssl-engines \
+ openssl10 \
+ openssl10-engines \
"
CRYPTO_SUPPORT_append_ti33x = " ti-crypto-examples cryptodev-module
cryptodev-tests"
--
2.17.1
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
