]> code.ossystems Code Review - openembedded-core.git/commitdiff
openssl: fix multilib files conflict
authorKai Kang <kai.kang@windriver.com>
Wed, 10 Jul 2019 07:21:29 +0000 (03:21 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 11 Jul 2019 08:32:44 +0000 (09:32 +0100)
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/openssl/openssl_1.1.1c.bb

index 01174073167e2906d01ced734c8073de80387052..af43d6992c950c58618db9fba54a5770d56374da 100644 (file)
@@ -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 = ""