diff options
| author | Kai Kang <kai.kang@windriver.com> | 2019-07-10 03:21:29 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-11 09:32:50 +0100 |
| commit | cf998b930c524942e39ce9b0bc655c32b87fdc92 (patch) | |
| tree | bb9a7a3c1d59c3d6986edc70b4f65ccbad50dac5 | |
| parent | 43a08e1936119e2e4a9223fb87b4a0e548271686 (diff) | |
| download | poky-cf998b930c524942e39ce9b0bc655c32b87fdc92.tar.gz | |
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
(From OE-Core rev: 01e17130f68a2b96c852756ea3dabef4164bc114)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1c.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb index 0117407316..af43d6992c 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 = " \ | |||
| 26 | SRC_URI[md5sum] = "15e21da6efe8aa0e0768ffd8cd37a5f6" | 26 | SRC_URI[md5sum] = "15e21da6efe8aa0e0768ffd8cd37a5f6" |
| 27 | SRC_URI[sha256sum] = "f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90" | 27 | SRC_URI[sha256sum] = "f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90" |
| 28 | 28 | ||
| 29 | inherit lib_package multilib_header ptest | 29 | inherit lib_package multilib_header multilib_script ptest |
| 30 | MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash" | ||
| 30 | 31 | ||
| 31 | PACKAGECONFIG ?= "" | 32 | PACKAGECONFIG ?= "" |
| 32 | PACKAGECONFIG_class-native = "" | 33 | PACKAGECONFIG_class-native = "" |