mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

kea: fix conflict between kea-dhcp6 multilibs

Browse Source 
There are conflict of config files between kea and lib32-kea:
  | Error: Transaction test error:
  | file /etc/kea/kea-dhcp6.conf conflicts between attempted installs of lib32-kea-2.6.1-r0.core2_32 and kea-2.6.      1-r0.core2_64

Similar to:
  | 8cc65e7eb0 kea: fix conflict between multilibs

(From OE-Core rev: 0fe8ec57f19d79e94f02e3c710a1b76c04b34143)

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Lei Maohui
2025-03-18 10:01:04 +08:00
committed by Richard Purdie
parent 3652b35c75
commit aa0cb5d94a
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
+27 -1
View File
@@ -8,17 +8,21 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 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 | 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 lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64
| file /etc/kea/kea-dhcp6.conf conflicts between attempted installs of
lib32-kea-2.6.1-r0.core2_32 and kea-2.6.1-r0.core2_64
Because they are all commented out, replace the expanded libdir path with Because they are all commented out, replace the expanded libdir path with
'$libdir' in the config files to avoid conflict. '$libdir' in the config files to avoid conflict.
Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602]
Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
--- ---
src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++-
src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++-- src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-) src/bin/keactrl/kea-dhcp6.conf.pre | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
index e6ae8b8..50a3092 100644 index e6ae8b8..50a3092 100644
@@ -56,3 +60,25 @@ index 6edb8a1..b2a7385 100644
// "parameters": { // "parameters": {
// "identifier-expression": "relay4[2].hex" // "identifier-expression": "relay4[2].hex"
// } // }
diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre
index 271021b..5b85854 100644
--- a/src/bin/keactrl/kea-dhcp6.conf.pre
+++ b/src/bin/keactrl/kea-dhcp6.conf.pre
@@ -201,7 +201,7 @@
// // of all devices serviced by Kea, including their identifiers
// // (like MAC address), their location in the network, times
// // when they were active etc.
- // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so",
+ // "library": "$libdir/kea/hooks/libdhcp_legal_log.so",
// "parameters": {
// "path": "/var/lib/kea",
// "base-name": "kea-forensic6"
@@ -218,7 +218,7 @@
// // of specific options or perhaps even a combination of several
// // options and fields to uniquely identify a client. Those scenarios
// // are addressed by the Flexible Identifiers hook application.
- // "library": "@libdir@/kea/hooks/libdhcp_flex_id.so",
+ // "library": "$libdir/kea/hooks/libdhcp_flex_id.so",
// "parameters": {
// "identifier-expression": "relay6[0].option[37].hex"
// }