* [PATCH 2/3 V3] kea: replace keactrl with kea daemons in initscripts
2026-01-12 8:11 [PATCH 1/3 V3] kea: fix creating runtime directory in service files Yi Zhao
@ 2026-01-12 8:11 ` Yi Zhao
2026-01-12 8:11 ` [PATCH 3/3 V3] kea: remove keactrl from package Yi Zhao
1 sibling, 0 replies; 3+ messages in thread
From: Yi Zhao @ 2026-01-12 8:11 UTC (permalink / raw)
To: openembedded-core
The keactrl script is used to run Kea from installation directory and is
primarily intended for developers[1][2]. The initscripts should call kea
daemon directly, rather than through the keactrl script.
Also add a volatile file to create runtime and state directories.
[1] https://gitlab.isc.org/isc-projects/kea/-/blob/master/src/bin/keactrl/keactrl.in?ref_type=heads#L10
[2] https://kea.readthedocs.io/en/latest/arm/keactrl.html
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../kea/files/kea-dhcp-ddns-server | 16 ++++++-----
.../kea/files/kea-dhcp4-server | 16 ++++++-----
.../kea/files/kea-dhcp6-server | 16 ++++++-----
.../kea/files/kea.volatiles | 2 ++
meta/recipes-connectivity/kea/kea_3.0.2.bb | 27 +++++++++++++------
5 files changed, 51 insertions(+), 26 deletions(-)
create mode 100644 meta/recipes-connectivity/kea/files/kea.volatiles
diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server b/meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server
index 50fe40d439..ebdf6f4dd6 100644
--- a/meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server
+++ b/meta/recipes-connectivity/kea/files/kea-dhcp-ddns-server
@@ -11,8 +11,9 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="kea-dhcp-ddns-server"
NAME=kea-dhcp-ddns
-DAEMON=/usr/sbin/keactrl
-DAEMON_ARGS=" -s dhcp_ddns"
+DAEMON=/usr/sbin/kea-dhcp-ddns
+DAEMON_ARGS="-c /etc/kea/kea-dhcp-ddns.conf"
+PIDFILE=/var/run/kea/kea-dhcp-ddns.kea-dhcp-ddns.pid
set -e
@@ -25,13 +26,12 @@ set -e
case "$1" in
start)
echo -n "Starting $DESC: "
- start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS
+ start-stop-daemon -S -b -n $NAME -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS
echo "done."
;;
stop)
echo -n "Stopping $DESC: "
- kpid=`pidof $NAME`
- kill $kpid
+ start-stop-daemon -K -p $PIDFILE -x $DAEMON
echo "done."
;;
restart|force-reload)
@@ -39,8 +39,12 @@ case "$1" in
$0 stop
$0 start
;;
+ status)
+ status $DAEMON
+ exit $?
+ ;;
*)
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 1
;;
esac
diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp4-server b/meta/recipes-connectivity/kea/files/kea-dhcp4-server
index e83e51025d..247f15d7fb 100644
--- a/meta/recipes-connectivity/kea/files/kea-dhcp4-server
+++ b/meta/recipes-connectivity/kea/files/kea-dhcp4-server
@@ -11,8 +11,9 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="kea-dhcp4-server"
NAME=kea-dhcp4
-DAEMON=/usr/sbin/keactrl
-DAEMON_ARGS=" -s dhcp4"
+DAEMON=/usr/sbin/kea-dhcp4
+DAEMON_ARGS="-c /etc/kea/kea-dhcp4.conf"
+PIDFILE=/var/run/kea/kea-dhcp4.kea-dhcp4.pid
set -e
@@ -25,13 +26,12 @@ set -e
case "$1" in
start)
echo -n "Starting $DESC: "
- start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS
+ start-stop-daemon -S -b -n $NAME -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS
echo "done."
;;
stop)
echo -n "Stopping $DESC: "
- kpid=`pidof $NAME`
- kill $kpid
+ start-stop-daemon -K -p $PIDFILE -x $DAEMON
echo "done."
;;
restart|force-reload)
@@ -39,8 +39,12 @@ case "$1" in
$0 stop
$0 start
;;
+ status)
+ status $DAEMON
+ exit $?
+ ;;
*)
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 1
;;
esac
diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp6-server b/meta/recipes-connectivity/kea/files/kea-dhcp6-server
index 10f2d22641..c04393ddb8 100644
--- a/meta/recipes-connectivity/kea/files/kea-dhcp6-server
+++ b/meta/recipes-connectivity/kea/files/kea-dhcp6-server
@@ -12,8 +12,9 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="kea-dhcp6-server"
NAME=kea-dhcp6
-DAEMON=/usr/sbin/keactrl
-DAEMON_ARGS=" -s dhcp6"
+DAEMON=/usr/sbin/kea-dhcp6
+DAEMON_ARGS="-c /etc/kea/kea-dhcp6.conf"
+PIDFILE=/var/run/kea/kea-dhcp6.kea-dhcp6.pid
set -e
@@ -26,13 +27,12 @@ set -e
case "$1" in
start)
echo -n "Starting $DESC: "
- start-stop-daemon -S -b -n $NAME -x $DAEMON -- start $DAEMON_ARGS
+ start-stop-daemon -S -b -n $NAME -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS
echo "done."
;;
stop)
echo -n "Stopping $DESC: "
- kpid=`pidof $NAME`
- kill $kpid
+ start-stop-daemon -K -p $PIDFILE -x $DAEMON
echo "done."
;;
restart|force-reload)
@@ -40,8 +40,12 @@ case "$1" in
$0 stop
$0 start
;;
+ status)
+ status $DAEMON
+ exit $?
+ ;;
*)
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 1
;;
esac
diff --git a/meta/recipes-connectivity/kea/files/kea.volatiles b/meta/recipes-connectivity/kea/files/kea.volatiles
new file mode 100644
index 0000000000..d0350e38a6
--- /dev/null
+++ b/meta/recipes-connectivity/kea/files/kea.volatiles
@@ -0,0 +1,2 @@
+d root root 0750 /var/run/kea none
+d root root 0644 /var/lib/kea none
diff --git a/meta/recipes-connectivity/kea/kea_3.0.2.bb b/meta/recipes-connectivity/kea/kea_3.0.2.bb
index 11e9bd13a2..ae1a1a74cf 100644
--- a/meta/recipes-connectivity/kea/kea_3.0.2.bb
+++ b/meta/recipes-connectivity/kea/kea_3.0.2.bb
@@ -14,6 +14,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \
file://kea-dhcp4-server \
file://kea-dhcp6-server \
file://kea-dhcp-ddns-server \
+ file://kea.volatiles \
file://fix-multilib-conflict.patch \
file://fix_pid_keactrl.patch \
file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
@@ -63,17 +64,27 @@ do_compile:prepend:class-target() {
}
do_install:append() {
- install -d ${D}${sysconfdir}/init.d
- install -d ${D}${systemd_system_unitdir}
-
- install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir}
- install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d
- sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
- -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \
- ${D}${systemd_system_unitdir}/kea-dhcp*service ${D}${sbindir}/keactrl
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}/${sysconfdir}/default/volatiles
+
+ install -m 0755 ${UNPACKDIR}/kea-*-server ${D}${sysconfdir}/init.d
+ install -m 0644 ${UNPACKDIR}/kea.volatiles ${D}/${sysconfdir}/default/volatiles/99_kea
+ fi
+
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+ install -d ${D}${systemd_system_unitdir}
+ install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir}
+
+ sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@BASE_BINDIR@,${base_bindir},g' \
+ -e 's,@LOCALSTATEDIR@,${localstatedir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+ ${D}${systemd_system_unitdir}/kea-dhcp*service
+ fi
+
sed -i -e "s:${B}:@abs_top_builddir_placeholder@:g" \
-e "s:${S}:@abs_top_srcdir_placeholder@:g" \
${D}${sbindir}/kea-admin
+
rm -rf ${D}${datadir}/${BPN}/meson-info
rm -rf ${D}${runtimedir}
rm -rf ${D}${localstatedir}
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 3/3 V3] kea: remove keactrl from package
2026-01-12 8:11 [PATCH 1/3 V3] kea: fix creating runtime directory in service files Yi Zhao
2026-01-12 8:11 ` [PATCH 2/3 V3] kea: replace keactrl with kea daemons in initscripts Yi Zhao
@ 2026-01-12 8:11 ` Yi Zhao
1 sibling, 0 replies; 3+ messages in thread
From: Yi Zhao @ 2026-01-12 8:11 UTC (permalink / raw)
To: openembedded-core
The keactrl script is used to run Kea from installation directory and is
primarily intended for developers[1][2]. It should not be shipped to kea
package. Remove it before packaging. A related patch is also removed.
[1] https://gitlab.isc.org/isc-projects/kea/-/blob/master/src/bin/keactrl/keactrl.in?ref_type=heads#L10
[2] https://kea.readthedocs.io/en/latest/arm/keactrl.html
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../kea/files/fix_pid_keactrl.patch | 32 -------------------
meta/recipes-connectivity/kea/kea_3.0.2.bb | 7 ++--
2 files changed, 4 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch
diff --git a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch
deleted file mode 100644
index af5a21defa..0000000000
--- a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4b1f48612fd1af40fff7b7b0a1d476e551458ab8 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
-
-Upstream-Status: Inappropriate [embedded specific]
-Based on changes from Diego Sueiro <Diego.Sueiro@arm.com>
-
-Signed-off-by: Armin kuster <akuster808@gmail.com>
-
-Refresh to apply on top of 2.6.1.
-
-Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
----
- src/bin/keactrl/keactrl.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in
-index da108d8..30e4832 100755
---- a/src/bin/keactrl/keactrl.in
-+++ b/src/bin/keactrl/keactrl.in
-@@ -157,8 +157,8 @@ check_running() {
- # Get the PID from the PID file (if it exists)
- get_pid_from_file "${proc_name}"
- if [ "${_pid}" -gt 0 ]; then
-- # Use ps to check if PID is alive
-- if ps -p "${_pid}" 1>/dev/null; then
-+ # Use pgrep and grep to check if PID is alive
-+ if pgrep -v 1 | grep ${_pid} 1>/dev/null; then
- # No error, so PID IS ALIVE
- _running=1
- fi
diff --git a/meta/recipes-connectivity/kea/kea_3.0.2.bb b/meta/recipes-connectivity/kea/kea_3.0.2.bb
index ae1a1a74cf..f46cb1bf80 100644
--- a/meta/recipes-connectivity/kea/kea_3.0.2.bb
+++ b/meta/recipes-connectivity/kea/kea_3.0.2.bb
@@ -16,7 +16,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \
file://kea-dhcp-ddns-server \
file://kea.volatiles \
file://fix-multilib-conflict.patch \
- file://fix_pid_keactrl.patch \
file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
file://0001-build-boost-1.89.0-fixes.patch \
file://0001-meson-use-a-runtime-safe-interpreter-string.patch \
@@ -88,10 +87,12 @@ do_install:append() {
rm -rf ${D}${datadir}/${BPN}/meson-info
rm -rf ${D}${runtimedir}
rm -rf ${D}${localstatedir}
+
+ # Remove keactrl
+ rm -f ${D}${sbindir}/keactrl ${D}${sysconfdir}/kea/keactrl.conf
}
-CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf \
- ${sysconfdir}/kea/kea-ctrl-agent.conf \
+CONFFILES:${PN} = "${sysconfdir}/kea/kea-ctrl-agent.conf \
${sysconfdir}/kea/kea-dhcp-ddns.conf \
${sysconfdir}/kea/kea-dhcp4.conf \
${sysconfdir}/kea/kea-dhcp6.conf \
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread