]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
openssl: fix multilib file install conflicts
authorXulin Sun <xulin.sun@windriver.com>
Tue, 29 Jan 2019 07:31:22 +0000 (15:31 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 31 Jan 2019 23:04:50 +0000 (23:04 +0000)
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/openssl/openssl_1.1.1a.bb

index 5c4e69cfb77d94e9f857faa4a6a7ed28f503f1d5..6676614bc046fe618fbaf599ae6b752f8c1ed9bf 100644 (file)
@@ -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"