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