Skip to contentSkip to conversation

openssl10, packagegroup-crypto: un-clash and install 1.0 binaries and engines

PATCH New Denys Dmytriyenko 1 participant 1 message May 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 openssl10, packagegroup-crypto: un-clash and install 1.0 binaries and engines

---
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(-)
meta-arago-distro/recipes-connectivity/openssl/openssl10_%.bbappend +12 -0
index e74bcba6..21fcb3e4 100644
@@ -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
+}
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb +3 -1
index 56e4e89e..4fe7057e 100644
@@ -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"
Signature · 1 line
2.17.1