summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
authorXulin Sun <xulin.sun@windriver.com>2019-01-29 15:31:22 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-31 23:23:27 +0000
commitd160e12690c6c1126a26c418816da52c8480fa00 (patch)
treeb7f1743992c6950be1874565a891addb9056b3dc /meta/recipes-connectivity/openssl
parentee3ac7c64ed4c96062e7d21eed1355d4b60b78c4 (diff)
downloadpoky-d160e12690c6c1126a26c418816da52c8480fa00.tar.gz
openssl: fix multilib file install conflicts
To avoid issue like below if run "bitbake lib32-core-image-minimal" with series userspace packages(LAMP,krb5...) added. Add multilib_script support for openssl's c_rehash which is a perl script. Error: Transaction check error: file /usr/bin/c_rehash conflicts between attempted installs of lib32-openssl-bin-1.1.1-r0.armv7at2hf_neon and openssl-bin-1.1.1-r0.aarch64 (From OE-Core rev: a4032f3cc5de451f0e97eca1f0cbe4a310e1560b) Signed-off-by: Xulin Sun <xulin.sun@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.1a.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 5c4e69cfb7..6676614bc0 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -206,3 +206,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
206RCONFLICTS_openssl-conf = "openssl10-conf" 206RCONFLICTS_openssl-conf = "openssl10-conf"
207 207
208BBCLASSEXTEND = "native nativesdk" 208BBCLASSEXTEND = "native nativesdk"
209
210inherit multilib_script
211
212MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"