Skip to contentSkip to conversation

kea: fix conflict between multilibs

PATCH In review Ma Xinjian 3 participants 4 messages Mar 17, 2025 – Mar 18, 2025

lore
Share & tools
lore

Ma Xinjian

author
#0 lore raw

PATCH 1/1 kea: fix conflict between multilibs

From: Lei Maohui <[email protected]>

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

---
 .../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
meta/recipes-connectivity/kea/files/fix-kea-dhcp6-multilib-conflict.patch new file +40 -0
new file mode 100644
index 0000000000..5b43f5a31a
@@ -0,0 +1,40 @@
+From 4433f5454618dc3b41ff936447f29b37923ea57b Mon Sep 17 00:00:00 2001
+From: Lei Maohui <[email protected]>
+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 <[email protected]>
+---
+ 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"
+     //       }
meta/recipes-connectivity/kea/kea_2.6.1.bb +1 -0
index ff7fb51fe0..0dd406812a 100644
@@ -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 \
Signature · 1 line
2.43.0
#1 lore raw

meta/recipes-connectivity/kea/files/fix-kea-dhcp6-multilib-conflict.patch line 11

Quoted 8 lines · Xinjian Ma (Fujitsu) via lists.openembedded.org
meta/recipes-connectivity/kea/files/fix-kea-dhcp6-multilib-conflict.patch new file +8 -0
+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

#2 lore raw

PATCH v2 1/1 kea: fix conflict between kea-dhcp6 multilibs

In reply to Ma Xinjian

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

---
 .../kea/files/fix-multilib-conflict.patch     | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)
meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +27 -1
index 5b135b3aee..763639327a 100644
@@ -8,17 +8,21 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
      lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64
 |  file /etc/kea/kea-dhcp4.conf conflicts between attempted installs of
      lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64
+|  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
 
 Because they are all commented out, replace the expanded libdir path with
 '$libdir' in the config files to avoid conflict.
 
 Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602]
 Signed-off-by: Kai Kang <[email protected]>
+Signed-off-by: Lei Maohui <[email protected]>
 
 ---
  src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++-
  src/bin/keactrl/kea-dhcp4.conf.pre      | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ src/bin/keactrl/kea-dhcp6.conf.pre      | 4 ++--
+ 3 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
 index e6ae8b8..50a3092 100644
@@ -56,3 +60,25 @@ index 6edb8a1..b2a7385 100644
      //       "parameters": {
      //           "identifier-expression": "relay4[2].hex"
      //       }
+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"
+     //       }
Signature · 1 line
2.43.0
#3 lore raw

Re: [OE-Core] [PATCH v2] kea: fix conflict between kea-dhcp6 multilibs

Thanks, this looks good to me.

Alex

Quoted 69 lines · Lei Maohui

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

---
 .../kea/files/fix-multilib-conflict.patch     | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)
meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +27 -2
index 5b135b3aee..763639327a 100644
@@ -8,17 +8,21 @@ Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
      lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64
 |  file /etc/kea/kea-dhcp4.conf conflicts between attempted installs of
      lib32-kea-1.7.10-r0.core2_32 and kea-1.7.10-r0.core2_64
+|  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
 
 Because they are all commented out, replace the expanded libdir path with
 '$libdir' in the config files to avoid conflict.
 
 Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602]
 Signed-off-by: Kai Kang <[email protected]>
+Signed-off-by: Lei Maohui <[email protected]>
 
 ---
  src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++-
  src/bin/keactrl/kea-dhcp4.conf.pre      | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ src/bin/keactrl/kea-dhcp6.conf.pre      | 4 ++--
+ 3 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre
 index e6ae8b8..50a3092 100644
@@ -56,3 +60,25 @@ index 6edb8a1..b2a7385 100644
      //       "parameters": {
      //           "identifier-expression": "relay4[2].hex"
      //       }
+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"
+     //       }
--

2.43.0