diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-03-31 12:31:13 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-01 08:14:57 +0100 |
commit | 34a7654689ca96ceb6fbe0753d650270189710eb (patch) | |
tree | 05fd425cc1c09db647d1b249756d0c9c2071de5f | |
parent | 7cce71cf54a4c272499594592a86de9338178bc7 (diff) | |
download | poky-34a7654689ca96ceb6fbe0753d650270189710eb.tar.gz |
openssl: add a "openssl10" PROVIDES
In 2.4 development cycle openssl 1.1 will replace openssl 1.0 as the
default openssl version. Openssl 1.0 will stay but will be renamed
to openssl10, and eventually it will be removed (hopefully much
sooner than the official end of support date of Dec 2019, as we do not
want an unsupported openssl version in supported Yocto releases).
There are several recipes that are not API compatible with 1.1; some
of them will eventually be fixed, but others will never be (such as Qt4).
To avoid breaking such recipes when openssl 1.1 is added to oe-core,
let's provide "openssl10" already now and change the recipes to depend
on that where necessary; Qt4 is a particularly pressing issue as it is
causing failures on the autobuilder with my work in progress
openssl 1.1 branch, and so I'm not able to see what else would fail
later in the build process.
(From OE-Core rev: cffc3a88608bd295eb1220fadae56eb4676414df)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 28421dab33..481a444560 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -37,6 +37,8 @@ FILES_${PN} =+ " ${libdir}/ssl/*" | |||
37 | FILES_${PN}-misc = "${libdir}/ssl/misc" | 37 | FILES_${PN}-misc = "${libdir}/ssl/misc" |
38 | RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" | 38 | RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" |
39 | 39 | ||
40 | PROVIDES += "openssl10" | ||
41 | |||
40 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto | 42 | # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto |
41 | # package RRECOMMENDS on this package. This will enable the configuration | 43 | # package RRECOMMENDS on this package. This will enable the configuration |
42 | # file to be installed for both the base openssl package and the libcrypto | 44 | # file to be installed for both the base openssl package and the libcrypto |