xref: /openbmc/openbmc/poky/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch (revision c3d88e4d9fcc08e1aae7cc9d0337c0261e996c64)
1*c3d88e4dSAndrew GeisslerThere are conflict of config files between kea and lib32-kea:
2*c3d88e4dSAndrew Geissler
3*c3d88e4dSAndrew Geissler| Error: Transaction test error:
4*c3d88e4dSAndrew Geissler|  file /etc/kea/kea-ctrl-agent.conf conflicts between attempted installs of
5*c3d88e4dSAndrew Geissler     lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64
6*c3d88e4dSAndrew Geissler|  file /etc/kea/kea-dhcp4.conf conflicts between attempted installs of
7*c3d88e4dSAndrew Geissler     lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64
8*c3d88e4dSAndrew Geissler
9*c3d88e4dSAndrew GeisslerBecause they are all commented out, replace the expanded libdir path with
10*c3d88e4dSAndrew Geissler'$libdir' in the config files to avoid conflict.
11*c3d88e4dSAndrew Geissler
12*c3d88e4dSAndrew GeisslerSigned-off-by: Kai Kang <kai.kang@windriver.com>
13*c3d88e4dSAndrew Geissler---
14*c3d88e4dSAndrew Geissler src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++-
15*c3d88e4dSAndrew Geissler src/bin/keactrl/kea-dhcp4.conf.pre      | 6 ++++--
16*c3d88e4dSAndrew Geissler 2 files changed, 6 insertions(+), 3 deletions(-)
17*c3d88e4dSAndrew Geissler
18*c3d88e4dSAndrew Geisslerdiff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
19*c3d88e4dSAndrew Geisslerindex 211b7ff..d710ec7 100644
20*c3d88e4dSAndrew Geissler--- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
21*c3d88e4dSAndrew Geissler+++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre
22*c3d88e4dSAndrew Geissler@@ -45,7 +45,8 @@
23*c3d88e4dSAndrew Geissler     // Agent will fail to start.
24*c3d88e4dSAndrew Geissler     "hooks-libraries": [
25*c3d88e4dSAndrew Geissler //  {
26*c3d88e4dSAndrew Geissler-//      "library": "@libdir@/kea/hooks/control-agent-commands.so",
27*c3d88e4dSAndrew Geissler+//      // Replace $libdir with real library path /usr/lib or /usr/lib64
28*c3d88e4dSAndrew Geissler+//      "library": "$libdir/kea/hooks/control-agent-commands.so",
29*c3d88e4dSAndrew Geissler //      "parameters": {
30*c3d88e4dSAndrew Geissler //          "param1": "foo"
31*c3d88e4dSAndrew Geissler //      }
32*c3d88e4dSAndrew Geisslerdiff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
33*c3d88e4dSAndrew Geisslerindex 5f77a32..70ae3d9 100644
34*c3d88e4dSAndrew Geissler--- a/src/bin/keactrl/kea-dhcp4.conf.pre
35*c3d88e4dSAndrew Geissler+++ b/src/bin/keactrl/kea-dhcp4.conf.pre
36*c3d88e4dSAndrew Geissler@@ -252,7 +252,8 @@
37*c3d88e4dSAndrew Geissler     //      // of all devices serviced by Kea, including their identifiers
38*c3d88e4dSAndrew Geissler     //      // (like MAC address), their location in the network, times
39*c3d88e4dSAndrew Geissler     //      // when they were active etc.
40*c3d88e4dSAndrew Geissler-    //      "library": "@libdir@/kea/hooks/libdhcp_legal_log.so"
41*c3d88e4dSAndrew Geissler+    //      // Replace $libdir with real library path /usr/lib or /usr/lib64
42*c3d88e4dSAndrew Geissler+    //      "library": "$libdir/kea/hooks/libdhcp_legal_log.so"
43*c3d88e4dSAndrew Geissler     //      "parameters": {
44*c3d88e4dSAndrew Geissler     //          "path": "/var/lib/kea",
45*c3d88e4dSAndrew Geissler     //          "base-name": "kea-forensic4"
46*c3d88e4dSAndrew Geissler@@ -269,7 +270,8 @@
47*c3d88e4dSAndrew Geissler     //      // of specific options or perhaps even a combination of several
48*c3d88e4dSAndrew Geissler     //      // options and fields to uniquely identify a client. Those scenarios
49*c3d88e4dSAndrew Geissler     //      // are addressed by the Flexible Identifiers hook application.
50*c3d88e4dSAndrew Geissler-    //      "library": "@libdir@/kea/hooks/libdhcp_flex_id.so",
51*c3d88e4dSAndrew Geissler+    //      // Replace $libdir with real library path /usr/lib or /usr/lib64
52*c3d88e4dSAndrew Geissler+    //      "library": "$libdir/kea/hooks/libdhcp_flex_id.so",
53*c3d88e4dSAndrew Geissler     //      "parameters": {
54*c3d88e4dSAndrew Geissler     //          "identifier-expression": "substring(relay6[0].option[18],0,8)"
55*c3d88e4dSAndrew Geissler     //      }
56