From: Richard Purdie Date: Fri, 31 Aug 2018 14:23:11 +0000 (+0100) Subject: openssl: Handle -conf package file conflicts X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=929b1b341b4b221ac10c8621bad27abfa7ae70bc;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 --- 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 3f4e19f2963..7fcb9c2c9b4 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"