summaryrefslogtreecommitdiffstats
path: root/meta
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-02-25 22:27:39 +0000
commit118407fb1e7011586905b59e9a1507a4e60bceab (patch)
tree82a7f09e92f4d3cd653679a60b3d2e43decf5c1b /meta
parenta9c1c920c03d6bcd48a32452d13bc8424290e5d3 (diff)
downloadpoky-118407fb1e7011586905b59e9a1507a4e60bceab.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) (From OE-Core rev: eb875a7ecb74a9a63d81c64ec770ec65ed5d0211) Signed-off-by: Xulin Sun <xulin.sun@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 0fc385fc14..e9e9facd34 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -204,3 +204,7 @@ RREPLACES_openssl-conf = "openssl10-conf"
204RCONFLICTS_openssl-conf = "openssl10-conf" 204RCONFLICTS_openssl-conf = "openssl10-conf"
205 205
206BBCLASSEXTEND = "native nativesdk" 206BBCLASSEXTEND = "native nativesdk"
207
208inherit multilib_script
209
210MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"