summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/kea/kea_1.7.10.bb
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2020-09-22 15:02:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-23 20:54:03 +0100
commit8cc65e7eb067413b4a9b1449c51f88158f3a6ae1 (patch)
tree8e6ae1c989b4850ebcbae21c17d7fdd0d8d3564e /meta/recipes-connectivity/kea/kea_1.7.10.bb
parentcfdbefde5a12b8ce90d4a02f94b0cd0e4fb4ccc8 (diff)
downloadpoky-8cc65e7eb067413b4a9b1449c51f88158f3a6ae1.tar.gz
kea: fix conflict between multilibs
There are conflict of config files between kea and lib32-kea: | Error: Transaction test error: | file /etc/kea/kea-ctrl-agent.conf conflicts between attempted installs of lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 | file /etc/kea/kea-dhcp4.conf conflicts between attempted installs of lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 Because they are all commented out, replace the expanded libdir path with '$libdir' in the config files to avoid conflict. (From OE-Core rev: 2cc07c4685c95e1d7a7f8e84947ea4f01e8357d3) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/kea/kea_1.7.10.bb')
-rw-r--r--meta/recipes-connectivity/kea/kea_1.7.10.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/kea/kea_1.7.10.bb b/meta/recipes-connectivity/kea/kea_1.7.10.bb
index d3c8834b46..2ea4b12758 100644
--- a/meta/recipes-connectivity/kea/kea_1.7.10.bb
+++ b/meta/recipes-connectivity/kea/kea_1.7.10.bb
@@ -13,6 +13,7 @@ SRC_URI = "\
13 file://kea-dhcp4.service \ 13 file://kea-dhcp4.service \
14 file://kea-dhcp6.service \ 14 file://kea-dhcp6.service \
15 file://kea-dhcp-ddns.service \ 15 file://kea-dhcp-ddns.service \
16 file://fix-multilib-conflict.patch \
16" 17"
17SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" 18SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82"
18 19