diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-31 15:23:11 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-04 11:03:56 +0100 |
| commit | a842b02a8778fc997a91f21e09e43a07def2a257 (patch) | |
| tree | 4930863fca5c7ee575412a1e1291744fe51b7629 /meta | |
| parent | 0892e449a5ec3f0bf2c9d2e8b08c005cd459f780 (diff) | |
| download | poky-a842b02a8778fc997a91f21e09e43a07def2a257.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.
(From OE-Core rev: bd92ff5759809df2542ce1bcba2c45bbd11d1e10)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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" | |||
| 175 | RDEPENDS_${PN}-misc = "perl" | 175 | RDEPENDS_${PN}-misc = "perl" |
| 176 | RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" | 176 | RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" |
| 177 | 177 | ||
| 178 | RPROVIDES_openssl-conf = "openssl10-conf" | ||
| 179 | RREPLACES_openssl-conf = "openssl10-conf" | ||
| 180 | RCONFLICTS_openssl-conf = "openssl10-conf" | ||
| 181 | |||
| 178 | BBCLASSEXTEND = "native nativesdk" | 182 | BBCLASSEXTEND = "native nativesdk" |