]> code.ossystems Code Review - openembedded-core.git/commitdiff
bind: fix multilib install file conflicts
authorKai Kang <kai.kang@windriver.com>
Sat, 29 Sep 2018 05:43:48 +0000 (13:43 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 29 Sep 2018 14:09:33 +0000 (15:09 +0100)
It adds ${libdir} to linker options in scripts bind9-config and
isc-config.sh. And then causes install file conflicts when install bind
andl ib32-bind both.

Inherit multilib_script.bbclass to fix this issue.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-connectivity/bind/bind_9.11.4.bb

index 23c3aadf9cb9efe0639c7ee38ad721b0ab33aa72..63d8b0baa84982b1d80957a64cebac1e5feadec6 100644 (file)
@@ -28,7 +28,9 @@ SRC_URI[sha256sum] = "595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/"
 
-inherit autotools update-rc.d systemd useradd pkgconfig
+inherit autotools update-rc.d systemd useradd pkgconfig multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
 
 # PACKAGECONFIGs readline and libedit should NOT be set at same time
 PACKAGECONFIG ?= "readline"