diff options
Diffstat (limited to 'meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch')
-rw-r--r-- | meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch index 5b135b3aee..763639327a 100644 --- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | |||
@@ -8,17 +8,21 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea: | |||
8 | lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 | 8 | lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 |
9 | | file /etc/kea/kea-dhcp4.conf conflicts between attempted installs of | 9 | | file /etc/kea/kea-dhcp4.conf conflicts between attempted installs of |
10 | lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 | 10 | lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64 |
11 | | file /etc/kea/kea-dhcp6.conf conflicts between attempted installs of | ||
12 | lib32-kea-2.6.1-r0.core2_32 and kea-2.6.1-r0.core2_64 | ||
11 | 13 | ||
12 | Because they are all commented out, replace the expanded libdir path with | 14 | Because they are all commented out, replace the expanded libdir path with |
13 | '$libdir' in the config files to avoid conflict. | 15 | '$libdir' in the config files to avoid conflict. |
14 | 16 | ||
15 | Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] | 17 | Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] |
16 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 18 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
19 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | ||
17 | 20 | ||
18 | --- | 21 | --- |
19 | src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- | 22 | src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- |
20 | src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++-- | 23 | src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++-- |
21 | 2 files changed, 4 insertions(+), 3 deletions(-) | 24 | src/bin/keactrl/kea-dhcp6.conf.pre | 4 ++-- |
25 | 3 files changed, 6 insertions(+), 5 deletions(-) | ||
22 | 26 | ||
23 | diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre | 27 | diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre |
24 | index e6ae8b8..50a3092 100644 | 28 | index e6ae8b8..50a3092 100644 |
@@ -56,3 +60,25 @@ index 6edb8a1..b2a7385 100644 | |||
56 | // "parameters": { | 60 | // "parameters": { |
57 | // "identifier-expression": "relay4[2].hex" | 61 | // "identifier-expression": "relay4[2].hex" |
58 | // } | 62 | // } |
63 | diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre | ||
64 | index 271021b..5b85854 100644 | ||
65 | --- a/src/bin/keactrl/kea-dhcp6.conf.pre | ||
66 | +++ b/src/bin/keactrl/kea-dhcp6.conf.pre | ||
67 | @@ -201,7 +201,7 @@ | ||
68 | // // of all devices serviced by Kea, including their identifiers | ||
69 | // // (like MAC address), their location in the network, times | ||
70 | // // when they were active etc. | ||
71 | - // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so", | ||
72 | + // "library": "$libdir/kea/hooks/libdhcp_legal_log.so", | ||
73 | // "parameters": { | ||
74 | // "path": "/var/lib/kea", | ||
75 | // "base-name": "kea-forensic6" | ||
76 | @@ -218,7 +218,7 @@ | ||
77 | // // of specific options or perhaps even a combination of several | ||
78 | // // options and fields to uniquely identify a client. Those scenarios | ||
79 | // // are addressed by the Flexible Identifiers hook application. | ||
80 | - // "library": "@libdir@/kea/hooks/libdhcp_flex_id.so", | ||
81 | + // "library": "$libdir/kea/hooks/libdhcp_flex_id.so", | ||
82 | // "parameters": { | ||
83 | // "identifier-expression": "relay6[0].option[37].hex" | ||
84 | // } | ||