diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-31 15:23:11 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-31 15:33:56 +0100 |
| commit | 929b1b341b4b221ac10c8621bad27abfa7ae70bc (patch) | |
| tree | b6dd2cdf8209e998981147c1e8fe4a4e513ccabb | |
| parent | 6626ff88fd88acbc89de2551c429010bd03ab002 (diff) | |
| download | openembedded-core-contrib-929b1b341b4b221ac10c8621bad27abfa7ae70bc.tar.gz | |
openssl: Handle -conf package file conflicts
The configuration files from 1.0 and 1.1 conflict:
"""
file /etc/ssl/openssl.cnf conflicts between attempted installs of openssl10-conf-1.0.2p-r0.i586 and openssl-conf-1.1.1+pre9-r0.i586
"""
Ensure that if 1.1 is present, it will overwrite the config file
from 1.0.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb index 3f4e19f296..7fcb9c2c9b 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb @@ -175,4 +175,8 @@ RDEPENDS_${PN}-bin = "perl" RDEPENDS_${PN}-misc = "perl" RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" +RPROVIDES_openssl-conf = "openssl10-conf" +RREPLACES_openssl-conf = "openssl10-conf" +RCONFLICTS_openssl-conf = "openssl10-conf" + BBCLASSEXTEND = "native nativesdk" |