mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
Wang Mingyu
b55f951cd7
Changelog: ========= -The library version numbers have been bumped up for the Kea 2.4.1 stable release. -Fixed interface redetection which had stopped working since Kea 2.3.6. -Fixed a race condition in free lease queue allocator fix-multilib-conflict.patch fix_pid_keactrl.patch refreshed for 2.4. (From OE-Core rev: 7afab39fd1c3239df3bb2fa49b79a5efaaaf9db6) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
59 lines
2.6 KiB
Diff
59 lines
2.6 KiB
Diff
From 06ebd1b2ced426c420ed162980eca194f9f918ae Mon Sep 17 00:00:00 2001
|
|
From: Kai Kang <kai.kang@windriver.com>
|
|
Date: Tue, 22 Sep 2020 15:02:33 +0800
|
|
Subject: [PATCH] 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.
|
|
|
|
Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602]
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
|
|
---
|
|
src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++-
|
|
src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++--
|
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
|
|
index e6ae8b8..50a3092 100644
|
|
--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
|
|
+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre
|
|
@@ -51,7 +51,8 @@
|
|
// Agent will fail to start.
|
|
"hooks-libraries": [
|
|
// {
|
|
-// "library": "@libdir@/kea/hooks/control-agent-commands.so",
|
|
+// // Replace $libdir with real library path /usr/lib or /usr/lib64
|
|
+// "library": "$libdir/kea/hooks/control-agent-commands.so",
|
|
// "parameters": {
|
|
// "param1": "foo"
|
|
// }
|
|
diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
|
|
index 6edb8a1..b2a7385 100644
|
|
--- a/src/bin/keactrl/kea-dhcp4.conf.pre
|
|
+++ b/src/bin/keactrl/kea-dhcp4.conf.pre
|
|
@@ -255,7 +255,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-forensic4"
|
|
@@ -272,7 +272,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": "relay4[2].hex"
|
|
// }
|