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 | 55 |
1 files changed, 29 insertions, 26 deletions
diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch index 733adf5536..5b135b3aee 100644 --- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | There are conflict of config files between kea and lib32-kea: | 1 | From 06ebd1b2ced426c420ed162980eca194f9f918ae Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | ||
3 | Date: Tue, 22 Sep 2020 15:02:33 +0800 | ||
4 | Subject: [PATCH] There are conflict of config files between kea and lib32-kea: | ||
2 | 5 | ||
3 | | Error: Transaction test error: | 6 | | Error: Transaction test error: |
4 | | file /etc/kea/kea-ctrl-agent.conf conflicts between attempted installs of | 7 | | file /etc/kea/kea-ctrl-agent.conf conflicts between attempted installs of |
@@ -9,17 +12,19 @@ There are conflict of config files between kea and lib32-kea: | |||
9 | Because they are all commented out, replace the expanded libdir path with | 12 | Because they are all commented out, replace the expanded libdir path with |
10 | '$libdir' in the config files to avoid conflict. | 13 | '$libdir' in the config files to avoid conflict. |
11 | 14 | ||
15 | Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] | ||
12 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 16 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
17 | |||
13 | --- | 18 | --- |
14 | src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- | 19 | src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- |
15 | src/bin/keactrl/kea-dhcp4.conf.pre | 6 ++++-- | 20 | src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++-- |
16 | 2 files changed, 6 insertions(+), 3 deletions(-) | 21 | 2 files changed, 4 insertions(+), 3 deletions(-) |
17 | 22 | ||
18 | diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre | 23 | diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre |
19 | index 211b7ff..d710ec7 100644 | 24 | index e6ae8b8..50a3092 100644 |
20 | --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre | 25 | --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre |
21 | +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre | 26 | +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre |
22 | @@ -45,7 +45,8 @@ | 27 | @@ -51,7 +51,8 @@ |
23 | // Agent will fail to start. | 28 | // Agent will fail to start. |
24 | "hooks-libraries": [ | 29 | "hooks-libraries": [ |
25 | // { | 30 | // { |
@@ -30,26 +35,24 @@ index 211b7ff..d710ec7 100644 | |||
30 | // "param1": "foo" | 35 | // "param1": "foo" |
31 | // } | 36 | // } |
32 | diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre | 37 | diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre |
33 | index 5f77a32..70ae3d9 100644 | 38 | index 6edb8a1..b2a7385 100644 |
34 | --- a/src/bin/keactrl/kea-dhcp4.conf.pre | 39 | --- a/src/bin/keactrl/kea-dhcp4.conf.pre |
35 | +++ b/src/bin/keactrl/kea-dhcp4.conf.pre | 40 | +++ b/src/bin/keactrl/kea-dhcp4.conf.pre |
36 | @@ -252,7 +252,8 @@ | 41 | @@ -255,7 +255,7 @@ |
37 | // // of all devices serviced by Kea, including their identifiers | 42 | // // of all devices serviced by Kea, including their identifiers |
38 | // // (like MAC address), their location in the network, times | 43 | // // (like MAC address), their location in the network, times |
39 | // // when they were active etc. | 44 | // // when they were active etc. |
40 | - // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so" | 45 | - // "library": "@libdir@/kea/hooks/libdhcp_legal_log.so", |
41 | + // // Replace $libdir with real library path /usr/lib or /usr/lib64 | 46 | + // "library": "$libdir/kea/hooks/libdhcp_legal_log.so", |
42 | + // "library": "$libdir/kea/hooks/libdhcp_legal_log.so" | 47 | // "parameters": { |
43 | // "parameters": { | 48 | // "path": "/var/lib/kea", |
44 | // "path": "/var/lib/kea", | 49 | // "base-name": "kea-forensic4" |
45 | // "base-name": "kea-forensic4" | 50 | @@ -272,7 +272,7 @@ |
46 | @@ -269,7 +270,8 @@ | 51 | // // of specific options or perhaps even a combination of several |
47 | // // of specific options or perhaps even a combination of several | 52 | // // options and fields to uniquely identify a client. Those scenarios |
48 | // // options and fields to uniquely identify a client. Those scenarios | 53 | // // are addressed by the Flexible Identifiers hook application. |
49 | // // are addressed by the Flexible Identifiers hook application. | 54 | - // "library": "@libdir@/kea/hooks/libdhcp_flex_id.so", |
50 | - // "library": "@libdir@/kea/hooks/libdhcp_flex_id.so", | 55 | + // "library": "$libdir/kea/hooks/libdhcp_flex_id.so", |
51 | + // // Replace $libdir with real library path /usr/lib or /usr/lib64 | 56 | // "parameters": { |
52 | + // "library": "$libdir/kea/hooks/libdhcp_flex_id.so", | 57 | // "identifier-expression": "relay4[2].hex" |
53 | // "parameters": { | 58 | // } |
54 | // "identifier-expression": "substring(relay6[0].option[18],0,8)" | ||
55 | // } | ||