From 7a4361c506ac24bafcf294f498d00278f11c3bd4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 18 Aug 2017 22:31:29 +0300 Subject: openssl10: rename back to openssl and make it the default via PREFERRED_VERSION openssl 1.1 broke 3rd party layers a lot more than was expected; let's flip the switch at the start of next development cycle. Add a PROVIDES = "openssl10" to openssl 1.0 recipe; any dependency that is not compatible with 1.1 should use that in its DEPENDS, as the 1.0 recipe will later be renamed back to openssl10. This does not always work: http://lists.openembedded.org/pipermail/openembedded-core/2017-August/140957.html but for many recipes it does. (From OE-Core rev: 5585103c195104e85ed7ac1455bef91b2e88a04d) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl10.inc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'meta/recipes-connectivity/openssl/openssl10.inc') diff --git a/meta/recipes-connectivity/openssl/openssl10.inc b/meta/recipes-connectivity/openssl/openssl10.inc index 19ccd18494..5782990850 100644 --- a/meta/recipes-connectivity/openssl/openssl10.inc +++ b/meta/recipes-connectivity/openssl/openssl10.inc @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8" DEPENDS = "makedepend-native hostperl-runtime-native" DEPENDS_append_class-target = " openssl-native" +PROVIDES += "openssl10" + SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ " S = "${WORKDIR}/openssl-${PV}" @@ -265,14 +267,3 @@ do_install_append_class-native() { BBCLASSEXTEND = "native nativesdk" -PACKAGE_PREPROCESS_FUNCS += "openssl_package_preprocess" - -openssl_package_preprocess () { - for file in `find ${PKGD} -name *.h -o -name *.pc -o -name *.so`; do - rm $file - done - rm ${PKGD}/usr/bin/openssl - rm ${PKGD}/usr/bin/c_rehash - rmdir ${PKGD}/usr/bin - -} -- cgit v1.2.3-54-g00ecf