diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-08-18 22:31:29 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-19 22:15:39 +0100 |
commit | 7a4361c506ac24bafcf294f498d00278f11c3bd4 (patch) | |
tree | 56bbceaba0356a4e447fcdc63d4d35a542629749 /meta/recipes-connectivity/openssl/openssl10.inc | |
parent | 05a67104676e192e959150eb49902bed82681545 (diff) | |
download | poky-7a4361c506ac24bafcf294f498d00278f11c3bd4.tar.gz |
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 <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl10.inc')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl10.inc | 13 |
1 files changed, 2 insertions, 11 deletions
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" | |||
11 | DEPENDS = "makedepend-native hostperl-runtime-native" | 11 | DEPENDS = "makedepend-native hostperl-runtime-native" |
12 | DEPENDS_append_class-target = " openssl-native" | 12 | DEPENDS_append_class-target = " openssl-native" |
13 | 13 | ||
14 | PROVIDES += "openssl10" | ||
15 | |||
14 | SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ | 16 | SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ |
15 | " | 17 | " |
16 | S = "${WORKDIR}/openssl-${PV}" | 18 | S = "${WORKDIR}/openssl-${PV}" |
@@ -265,14 +267,3 @@ do_install_append_class-native() { | |||
265 | 267 | ||
266 | BBCLASSEXTEND = "native nativesdk" | 268 | BBCLASSEXTEND = "native nativesdk" |
267 | 269 | ||
268 | PACKAGE_PREPROCESS_FUNCS += "openssl_package_preprocess" | ||
269 | |||
270 | openssl_package_preprocess () { | ||
271 | for file in `find ${PKGD} -name *.h -o -name *.pc -o -name *.so`; do | ||
272 | rm $file | ||
273 | done | ||
274 | rm ${PKGD}/usr/bin/openssl | ||
275 | rm ${PKGD}/usr/bin/c_rehash | ||
276 | rmdir ${PKGD}/usr/bin | ||
277 | |||
278 | } | ||