From 118407fb1e7011586905b59e9a1507a4e60bceab Mon Sep 17 00:00:00 2001 From: Xulin Sun Date: Tue, 29 Jan 2019 15:31:22 +0800 Subject: 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 Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/recipes-connectivity/openssl') 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" RCONFLICTS_openssl-conf = "openssl10-conf" BBCLASSEXTEND = "native nativesdk" + +inherit multilib_script + +MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" -- cgit v1.2.3-54-g00ecf