diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2020-09-22 15:02:33 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-23 20:53:10 +0100 |
| commit | 2cc07c4685c95e1d7a7f8e84947ea4f01e8357d3 (patch) | |
| tree | e8ad7b3b7b6370936850f97c87122587682d6eb0 /meta/recipes-connectivity/kea/kea_1.7.10.bb | |
| parent | 5195d5cde3467357cbda4d09e43da12963025142 (diff) | |
| download | openembedded-core-contrib-2cc07c4685c95e1d7a7f8e84947ea4f01e8357d3.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.
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.bb | 1 |
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 = "\ file://kea-dhcp4.service \ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \ + file://fix-multilib-conflict.patch \ " SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" |