mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 14:09:47 +00:00
Code Issues Projects Releases Wiki Activity

kea: upgrade 2.4.0 -> 2.4.1

Browse Source 
Changelog:
=========
-The library version numbers have been bumped up for the Kea 2.4.1 stable release.
-Fixed interface redetection which had stopped working since Kea 2.3.6.
-Fixed a race condition in free lease queue allocator

fix-multilib-conflict.patch
fix_pid_keactrl.patch
refreshed for 2.4.

(From OE-Core rev: fcf269bd8fc607882960cebc2c6e2e557517647d)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 7afab39fd1c3239df3bb2fa49b79a5efaaaf9db6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
Wang Mingyu
2023-12-19 17:33:46 +08:00
committed by Steve Sakoman
parent d18ebf9271
commit 88e9607d71
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From d027b1d85a8c1a0193b6e4a00083d3038d699a59 Mon Sep 17 00:00:00 2001 From 06ebd1b2ced426c420ed162980eca194f9f918ae Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com> From: Kai Kang <kai.kang@windriver.com>
Date: Tue, 22 Sep 2020 15:02:33 +0800 Date: Tue, 22 Sep 2020 15:02:33 +0800
Subject: [PATCH] There are conflict of config files between kea and lib32-kea: Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
@@ -35,10 +35,10 @@ index e6ae8b8..50a3092 100644
// "param1": "foo" // "param1": "foo"
// } // }
diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre
index 26bf163..49ddb0a 100644 index 6edb8a1..b2a7385 100644
--- a/src/bin/keactrl/kea-dhcp4.conf.pre --- a/src/bin/keactrl/kea-dhcp4.conf.pre
+++ b/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre
@@ -252,7 +252,7 @@ @@ -255,7 +255,7 @@
// // of all devices serviced by Kea, including their identifiers // // of all devices serviced by Kea, including their identifiers
// // (like MAC address), their location in the network, times // // (like MAC address), their location in the network, times
// // when they were active etc. // // when they were active etc.
@@ -47,7 +47,7 @@ index 26bf163..49ddb0a 100644
// "parameters": { // "parameters": {
// "path": "/var/lib/kea", // "path": "/var/lib/kea",
// "base-name": "kea-forensic4" // "base-name": "kea-forensic4"
@@ -269,7 +269,7 @@ @@ -272,7 +272,7 @@
// // of specific options or perhaps even a combination of several // // of specific options or perhaps even a combination of several
// // options and fields to uniquely identify a client. Those scenarios // // options and fields to uniquely identify a client. Those scenarios
// // are addressed by the Flexible Identifiers hook application. // // are addressed by the Flexible Identifiers hook application.
meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 18f4f6206c248d6169aa67b3ecf16bf54e9292e8 Mon Sep 17 00:00:00 2001 From c878a356712606549f7f188b62f7d1cae08a176e Mon Sep 17 00:00:00 2001
From: Armin kuster <akuster808@gmail.com> From: Armin kuster <akuster808@gmail.com>
Date: Wed, 14 Oct 2020 22:48:31 -0700 Date: Wed, 14 Oct 2020 22:48:31 -0700
Subject: [PATCH] Busybox does not support ps -p so use pgrep Subject: [PATCH] Busybox does not support ps -p so use pgrep
@@ -13,10 +13,10 @@ Signed-off-by: Armin kuster <akuster808@gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in
index ae5bd8e..e9f9b73 100644 index 450e997..c353ca9 100644
--- a/src/bin/keactrl/keactrl.in --- a/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in +++ b/src/bin/keactrl/keactrl.in
@@ -151,8 +151,8 @@ check_running() { @@ -149,8 +149,8 @@ check_running() {
# Get the PID from the PID file (if it exists) # Get the PID from the PID file (if it exists)
get_pid_from_file "${proc_name}" get_pid_from_file "${proc_name}"
if [ ${_pid} -gt 0 ]; then if [ ${_pid} -gt 0 ]; then
meta/recipes-connectivity/kea/kea_2.4.0.bb → meta/recipes-connectivity/kea/kea_2.4.1.bb
+1 -1
View File
@@ -19,7 +19,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
file://0001-kea-fix-reproducible-build-failure.patch \ file://0001-kea-fix-reproducible-build-failure.patch \
" "
SRC_URI[sha256sum] = "3a33cd08dc3319ff544e6bbf2c0429042106f4051ebe115dc1bb2625c95003f7" SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a"
inherit autotools systemd update-rc.d upstream-version-is-even inherit autotools systemd update-rc.d upstream-version-is-even