summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
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-10-01 13:04:49 +0100
commit282412460ceea92572258ed3139cbf1f5c0afe3f (patch)
treef083cb6978af787da64433b43a058ab01f24af93 /meta/recipes-connectivity
parent7481db95536a60a29e0246d5fcf093f792672e90 (diff)
downloadpoky-282412460ceea92572258ed3139cbf1f5c0afe3f.tar.gz
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. (From OE-Core rev: d3baeaf09d5d3e7548e5b2ea1b565880ea6ce994) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-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
28UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" 28UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
29UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/" 29UPSTREAM_CHECK_REGEX = "(?P<pver>9(\.\d+)+(-P\d+)*)/"
30 30
31inherit autotools update-rc.d systemd useradd pkgconfig 31inherit autotools update-rc.d systemd useradd pkgconfig multilib_script
32
33MULTILIB_SCRIPTS = "${PN}:${bindir}/bind9-config ${PN}:${bindir}/isc-config.sh"
32 34
33# PACKAGECONFIGs readline and libedit should NOT be set at same time 35# PACKAGECONFIGs readline and libedit should NOT be set at same time
34PACKAGECONFIG ?= "readline" 36PACKAGECONFIG ?= "readline"