mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
kea: upgrade 2.4.0 -> 2.4.1
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: 7afab39fd1c3239df3bb2fa49b79a5efaaaf9db6) 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>
This commit is contained in:
committed by
Richard Purdie
parent
147450c823
commit
b55f951cd7
@@ -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>
|
||||
Date: Tue, 22 Sep 2020 15:02:33 +0800
|
||||
Subject: [PATCH] There are conflict of config files between kea and lib32-kea:
|
||||
@@ -35,10 +35,10 @@ index e6ae8b8..50a3092 100644
|
||||
// "param1": "foo"
|
||||
// }
|
||||
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
|
||||
+++ 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
|
||||
// // (like MAC address), their location in the network, times
|
||||
// // when they were active etc.
|
||||
@@ -47,7 +47,7 @@ index 26bf163..49ddb0a 100644
|
||||
// "parameters": {
|
||||
// "path": "/var/lib/kea",
|
||||
// "base-name": "kea-forensic4"
|
||||
@@ -269,7 +269,7 @@
|
||||
@@ -272,7 +272,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.
|
||||
|
||||
@@ -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>
|
||||
Date: Wed, 14 Oct 2020 22:48:31 -0700
|
||||
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(-)
|
||||
|
||||
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
|
||||
+++ 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_pid_from_file "${proc_name}"
|
||||
if [ ${_pid} -gt 0 ]; then
|
||||
|
||||
@@ -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-kea-fix-reproducible-build-failure.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "3a33cd08dc3319ff544e6bbf2c0429042106f4051ebe115dc1bb2625c95003f7"
|
||||
SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a"
|
||||
|
||||
inherit autotools systemd update-rc.d upstream-version-is-even
|
||||
|
||||
Reference in New Issue
Block a user