diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2023-12-19 17:33:46 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-23 08:46:00 +0000 |
commit | b55f951cd77e3d7b7ceb6f38f0099bf918780e45 (patch) | |
tree | 5b5c6a8501c76d29c8823f5b74843e98a9b916fb /meta/recipes-connectivity | |
parent | 147450c82339e4c75544376ffa2f6fed6296c617 (diff) | |
download | poky-b55f951cd77e3d7b7ceb6f38f0099bf918780e45.tar.gz |
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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | 8 | ||||
-rw-r--r-- | meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch | 6 | ||||
-rw-r--r-- | meta/recipes-connectivity/kea/kea_2.4.1.bb (renamed from meta/recipes-connectivity/kea/kea_2.4.0.bb) | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch index 451b409c88..5b135b3aee 100644 --- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d027b1d85a8c1a0193b6e4a00083d3038d699a59 Mon Sep 17 00:00:00 2001 | 1 | From 06ebd1b2ced426c420ed162980eca194f9f918ae Mon Sep 17 00:00:00 2001 |
2 | From: Kai Kang <kai.kang@windriver.com> | 2 | From: Kai Kang <kai.kang@windriver.com> |
3 | Date: Tue, 22 Sep 2020 15:02:33 +0800 | 3 | Date: Tue, 22 Sep 2020 15:02:33 +0800 |
4 | Subject: [PATCH] There are conflict of config files between kea and lib32-kea: | 4 | Subject: [PATCH] There are conflict of config files between kea and lib32-kea: |
@@ -35,10 +35,10 @@ index e6ae8b8..50a3092 100644 | |||
35 | // "param1": "foo" | 35 | // "param1": "foo" |
36 | // } | 36 | // } |
37 | diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre | 37 | diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre |
38 | index 26bf163..49ddb0a 100644 | 38 | index 6edb8a1..b2a7385 100644 |
39 | --- a/src/bin/keactrl/kea-dhcp4.conf.pre | 39 | --- a/src/bin/keactrl/kea-dhcp4.conf.pre |
40 | +++ b/src/bin/keactrl/kea-dhcp4.conf.pre | 40 | +++ b/src/bin/keactrl/kea-dhcp4.conf.pre |
41 | @@ -252,7 +252,7 @@ | 41 | @@ -255,7 +255,7 @@ |
42 | // // of all devices serviced by Kea, including their identifiers | 42 | // // of all devices serviced by Kea, including their identifiers |
43 | // // (like MAC address), their location in the network, times | 43 | // // (like MAC address), their location in the network, times |
44 | // // when they were active etc. | 44 | // // when they were active etc. |
@@ -47,7 +47,7 @@ index 26bf163..49ddb0a 100644 | |||
47 | // "parameters": { | 47 | // "parameters": { |
48 | // "path": "/var/lib/kea", | 48 | // "path": "/var/lib/kea", |
49 | // "base-name": "kea-forensic4" | 49 | // "base-name": "kea-forensic4" |
50 | @@ -269,7 +269,7 @@ | 50 | @@ -272,7 +272,7 @@ |
51 | // // of specific options or perhaps even a combination of several | 51 | // // of specific options or perhaps even a combination of several |
52 | // // options and fields to uniquely identify a client. Those scenarios | 52 | // // options and fields to uniquely identify a client. Those scenarios |
53 | // // are addressed by the Flexible Identifiers hook application. | 53 | // // are addressed by the Flexible Identifiers hook application. |
diff --git a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch index b7c2fd4f0d..63a6a2805b 100644 --- a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch +++ b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 18f4f6206c248d6169aa67b3ecf16bf54e9292e8 Mon Sep 17 00:00:00 2001 | 1 | From c878a356712606549f7f188b62f7d1cae08a176e Mon Sep 17 00:00:00 2001 |
2 | From: Armin kuster <akuster808@gmail.com> | 2 | From: Armin kuster <akuster808@gmail.com> |
3 | Date: Wed, 14 Oct 2020 22:48:31 -0700 | 3 | Date: Wed, 14 Oct 2020 22:48:31 -0700 |
4 | Subject: [PATCH] Busybox does not support ps -p so use pgrep | 4 | Subject: [PATCH] Busybox does not support ps -p so use pgrep |
@@ -13,10 +13,10 @@ Signed-off-by: Armin kuster <akuster808@gmail.com> | |||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
14 | 14 | ||
15 | diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in | 15 | diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in |
16 | index ae5bd8e..e9f9b73 100644 | 16 | index 450e997..c353ca9 100644 |
17 | --- a/src/bin/keactrl/keactrl.in | 17 | --- a/src/bin/keactrl/keactrl.in |
18 | +++ b/src/bin/keactrl/keactrl.in | 18 | +++ b/src/bin/keactrl/keactrl.in |
19 | @@ -151,8 +151,8 @@ check_running() { | 19 | @@ -149,8 +149,8 @@ check_running() { |
20 | # Get the PID from the PID file (if it exists) | 20 | # Get the PID from the PID file (if it exists) |
21 | get_pid_from_file "${proc_name}" | 21 | get_pid_from_file "${proc_name}" |
22 | if [ ${_pid} -gt 0 ]; then | 22 | if [ ${_pid} -gt 0 ]; then |
diff --git a/meta/recipes-connectivity/kea/kea_2.4.0.bb b/meta/recipes-connectivity/kea/kea_2.4.1.bb index 316468754e..c3aa4dc8f0 100644 --- a/meta/recipes-connectivity/kea/kea_2.4.0.bb +++ b/meta/recipes-connectivity/kea/kea_2.4.1.bb | |||
@@ -19,7 +19,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ | |||
19 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ | 19 | file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ |
20 | file://0001-kea-fix-reproducible-build-failure.patch \ | 20 | file://0001-kea-fix-reproducible-build-failure.patch \ |
21 | " | 21 | " |
22 | SRC_URI[sha256sum] = "3a33cd08dc3319ff544e6bbf2c0429042106f4051ebe115dc1bb2625c95003f7" | 22 | SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" |
23 | 23 | ||
24 | inherit autotools systemd update-rc.d upstream-version-is-even | 24 | inherit autotools systemd update-rc.d upstream-version-is-even |
25 | 25 | ||