From d3baeaf09d5d3e7548e5b2ea1b565880ea6ce994 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sat, 29 Sep 2018 13:43:48 +0800 Subject: bind: fix multilib install file conflicts 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bind/bind_9.11.4.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/bind/bind_9.11.4.bb b/meta/recipes-connectivity/bind/bind_9.11.4.bb index 23c3aadf9c..63d8b0baa8 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.4.bb +++ b/meta/recipes-connectivity/bind/bind_9.11.4.bb @@ -28,7 +28,9 @@ SRC_URI[sha256sum] = "595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" UPSTREAM_CHECK_REGEX = "(?P9(\.\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" -- cgit 1.2.3-korg