diff mbox series

kea: fix conflict between multilibs

Message ID 20250317014144.2113-1-maxj.fnst@fujitsu.com
State Accepted, archived
Commit 2cc07c4685c95e1d7a7f8e84947ea4f01e8357d3
Headers show
Series kea: fix conflict between multilibs | expand

Commit Message

Ma Xinjian March 17, 2025, 1:41 a.m. UTC 
From: Lei Maohui <leimaohui@fujitsu.com>

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

Similar to:
  | 8cc65e7eb0 kea: fix conflict between multilibs

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
---
 .../fix-kea-dhcp6-multilib-conflict.patch     | 40 +++++++++++++++++++
 meta/recipes-connectivity/kea/kea_2.6.1.bb    |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 meta/recipes-connectivity/kea/files/fix-kea-dhcp6-multilib-conflict.patch

Comments

Alexander Kanavin March 17, 2025, 12:25 p.m. UTC | #1 
On Mon, 17 Mar 2025 at 02:41, Xinjian Ma (Fujitsu) via
lists.openembedded.org <maxj.fnst=fujitsu.com@lists.openembedded.org>
wrote:
> +Subject: [PATCH] kea: fix conflict between multilibs
> +
> +There are conflict of config files between kea and lib32-kea:
> +  | Error: Transaction test error:
> +  | file /etc/kea/kea-dhcp6.conf conflicts between attempted installs of lib32-kea-2.6.1-r0.core2_32 and kea-2.6.1-r0.core2_64
> +
> +Similar to:
> +  | 8cc65e7eb067413b4a9b1449c51f88158f3a6ae1 kea: fix conflict between multilibs

Can you rather adjust that patch (add the new chunk to it and your
s-o-b), instead of adding a whole new patch?

Alex
diff mbox series

Patch

diff --git a/meta/recipes-connectivity/kea/files/fix-kea-dhcp6-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-kea-dhcp6-multilib-conflict.patch
new file mode 100644
index 0000000000..5b43f5a31a
--- /dev/null
+++ b/meta/recipes-connectivity/kea/files/fix-kea-dhcp6-multilib-conflict.patch
@@ -0,0 +1,40 @@ 
+From 4433f5454618dc3b41ff936447f29b37923ea57b Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@fujitsu.com>
+Date: Fri, 14 Mar 2025 07:47:15 +0000
+Subject: [PATCH] kea: fix conflict between multilibs
+
+There are conflict of config files between kea and lib32-kea:
+  | Error: Transaction test error:
+  | file /etc/kea/kea-dhcp6.conf conflicts between attempted installs of lib32-kea-2.6.1-r0.core2_32 and kea-2.6.1-r0.core2_64
+
+Similar to:
+  | 8cc65e7eb067413b4a9b1449c51f88158f3a6ae1 kea: fix conflict between multilibs
+
+Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602]
+Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
+---
+ src/bin/keactrl/kea-dhcp6.conf.pre | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/bin/keactrl/kea-dhcp6.conf.pre b/src/bin/keactrl/kea-dhcp6.conf.pre
+index 271021b..5b85854 100644
+--- a/src/bin/keactrl/kea-dhcp6.conf.pre
++++ b/src/bin/keactrl/kea-dhcp6.conf.pre
+@@ -201,7 +201,7 @@
+     //       // of all devices serviced by Kea, including their identifiers
+     //       // (like MAC address), their location in the network, times
+     //       // when they were active etc.
+-    //       "library": "@libdir@/kea/hooks/libdhcp_legal_log.so",
++    //       "library": "$libdir/kea/hooks/libdhcp_legal_log.so",
+     //       "parameters": {
+     //           "path": "/var/lib/kea",
+     //           "base-name": "kea-forensic6"
+@@ -218,7 +218,7 @@
+     //       // 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.
+-    //       "library": "@libdir@/kea/hooks/libdhcp_flex_id.so",
++    //       "library": "$libdir/kea/hooks/libdhcp_flex_id.so",
+     //       "parameters": {
+     //           "identifier-expression": "relay6[0].option[37].hex"
+     //       }
diff --git a/meta/recipes-connectivity/kea/kea_2.6.1.bb b/meta/recipes-connectivity/kea/kea_2.6.1.bb
index ff7fb51fe0..0dd406812a 100644
--- a/meta/recipes-connectivity/kea/kea_2.6.1.bb
+++ b/meta/recipes-connectivity/kea/kea_2.6.1.bb
@@ -15,6 +15,7 @@  SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
            file://kea-dhcp6-server \
            file://kea-dhcp-ddns-server \
            file://fix-multilib-conflict.patch \
+           file://fix-kea-dhcp6-multilib-conflict.patch \
            file://fix_pid_keactrl.patch \
            file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
            file://0001-Replace-Name-NameString-with-vector-of-uint8_t.patch \