summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-09-29 13:43:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-29 15:09:33 +0100
commitd3baeaf09d5d3e7548e5b2ea1b565880ea6ce994 (patch)
treeb00ed3c93616be6b97e26970e1745d409632964c
parentdf90cb1f4ee8918b0bc2a281b2d77444a0d037e7 (diff)
downloadopenembedded-core-contrib-d3baeaf09d5d3e7548e5b2ea1b565880ea6ce994.tar.gz
openembedded-core-contrib-d3baeaf09d5d3e7548e5b2ea1b565880ea6ce994.tar.bz2
openembedded-core-contrib-d3baeaf09d5d3e7548e5b2ea1b565880ea6ce994.zip
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 <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bind/bind_9.11.4.bb4
1 files changed, 3 insertions, 1 deletions
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 = "(?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"