[oe-commits] [openembedded-core] 12/21: openssl: fix multilib file install conflicts

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit f517a6da992a32cf0f3dd3de58e101ed8b0651df
Author: Xulin Sun <xulin.sun at windriver.com>
AuthorDate: Tue Jan 29 15:31:22 2019 +0800

    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
    
    Signed-off-by: Xulin Sun <xulin.sun at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 5c4e69c..6676614 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"
 RCONFLICTS_openssl-conf = "openssl10-conf"
 
 BBCLASSEXTEND = "native nativesdk"
+
+inherit multilib_script
+
+MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.