[oe-commits] [openembedded-core] 05/07: openssl: fix multilib files conflict

[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 1070d8fbb273217e956efc4c47c363b2a2e5fb62
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Wed Jul 10 03:21:29 2019 -0400

    openssl: fix multilib files conflict
    
    Inherit multilib_script to fix openssl multilib files conflict issue:
    
    | Error: Transaction check error:
    |   file /usr/bin/c_rehash conflicts between attempted installs of
    |   lib32-openssl-bin-1.1.1c-r0.core2_32 and openssl-bin-1.1.1c-r0.core2_64
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-connectivity/openssl/openssl_1.1.1c.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb
index 0117407..af43d69 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb
@@ -26,7 +26,8 @@ SRC_URI_append_class-nativesdk = " \
 SRC_URI[md5sum] = "15e21da6efe8aa0e0768ffd8cd37a5f6"
 SRC_URI[sha256sum] = "f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90"
 
-inherit lib_package multilib_header ptest
+inherit lib_package multilib_header multilib_script ptest
+MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG_class-native = ""

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