kea: fix conflict between kea-dhcp4 and kea-dhcp6 multilibs

There are conflict of config files between kea and lib32-kea:
  | Error: Transaction test error:
  | file /etc/kea/kea-dhcp4.conf conflicts between attempted installs of lib32-kea-3.0.1-r0.core2_32 and kea-3.0.1-r0.x86_64_v3
  | file /etc/kea/kea-dhcp6.conf conflicts between attempted installs of lib32-kea-3.0.1-r0.core2_32 and kea-3.0.1-r0.x86_64_v3

Update this patch after kea was upgraded to 3.0.1.

Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
index 9e1f28b56032161951e790b6e0b8e1b21005c960..68a566773a1dea25eefb7466fa96b5a170d20d00 100644 (file)
--- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
+++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
@@ -1,7 +1,8 @@
-From 06ebd1b2ced426c420ed162980eca194f9f918ae Mon Sep 17 00:00:00 2001
+From cdef313bd34c5abd897b80f25554b0c66737ed05 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:
+Date: Tue, 14 Oct 2025 01:37:35 +0000
+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
@@ -17,13 +18,15 @@ Because they are all commented out, replace the expanded libdir path with
 Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602]
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
-
+Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
 ---
  src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++-
- src/bin/keactrl/kea-dhcp4.conf.pre      | 4 ++--
- src/bin/keactrl/kea-dhcp6.conf.pre      | 4 ++--
- 3 files changed, 6 insertions(+), 5 deletions(-)
+ src/bin/keactrl/kea-dhcp4.conf.pre      | 6 +++---
+ src/bin/keactrl/kea-dhcp6.conf.pre      | 6 +++---
+ 3 files changed, 8 insertions(+), 7 deletions(-)
 
+diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
+index 29d8111..de71f41 100644
 --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre
 +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre
 @@ -85,7 +85,8 @@
@@ -36,6 +39,8 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
  //      "parameters": {
  //          "param1": "foo"
  //      }
+diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
+index 2a58507..86b5abf 100644
 --- a/src/bin/keactrl/kea-dhcp4.conf.pre
 +++ b/src/bin/keactrl/kea-dhcp4.conf.pre
 @@ -255,7 +255,7 @@
@@ -47,7 +52,7 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
      //       "parameters": {
      //           "base-name": "kea-forensic4"
      //       }
-@@ -271,7 +271,7 @@
+@@ -271,14 +271,14 @@
      //       // 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.
@@ -56,6 +61,16 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
      //       "parameters": {
      //           "identifier-expression": "relay4[2].hex"
      //       }
+     //   },
+     //   {
+     //       // the MySQL host backend hook library required for host storage.
+-    //       "library": "@libdir@/kea/hooks/libdhcp_mysql.so"
++    //       "library": "$libdir/kea/hooks/libdhcp_mysql.so"
+     //   }
+     // ],
+ 
+diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre
+index c69a508..2bb488f 100644
 --- a/src/bin/keactrl/kea-dhcp6.conf.pre
 +++ b/src/bin/keactrl/kea-dhcp6.conf.pre
 @@ -201,7 +201,7 @@
@@ -67,7 +82,7 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
      //       "parameters": {
      //           "base-name": "kea-forensic6"
      //       }
-@@ -217,7 +217,7 @@
+@@ -217,14 +217,14 @@
      //       // 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.
@@ -76,3 +91,14 @@ Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
      //       "parameters": {
      //           "identifier-expression": "relay6[0].option[37].hex"
      //       }
+     //   },
+     //   {
+     //       // the MySQL host backend hook library required for host storage.
+-    //       "library": "@libdir@/kea/hooks/libdhcp_mysql.so"
++    //       "library": "$libdir/kea/hooks/libdhcp_mysql.so"
+     //   }
+     // ],
+ 
+-- 
+2.43.0
+