summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-31 15:23:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-04 11:03:31 +0100
commitbd92ff5759809df2542ce1bcba2c45bbd11d1e10 (patch)
treec74dec4ba4c982d83d6378b602be647f82c119e3 /meta/recipes-connectivity
parent13b82380abb273e6575b1e74870d3fe8249ebbc1 (diff)
downloadopenembedded-core-contrib-bd92ff5759809df2542ce1bcba2c45bbd11d1e10.tar.gz
openembedded-core-contrib-bd92ff5759809df2542ce1bcba2c45bbd11d1e10.tar.bz2
openembedded-core-contrib-bd92ff5759809df2542ce1bcba2c45bbd11d1e10.zip
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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.1-pre9.bb4
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"