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 <[email protected]> --- .../kea/files/fix_pid_keactrl.patch | 30 ------------------- meta/recipes-connectivity/kea/kea_3.0.1.bb | 7 +++-- 2 files changed, 4 insertions(+), 33 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 9cc91bdddf..0000000000 --- a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f5125725e4e2e250ccc78a17a8b77431100e7c15 Mon Sep 17 00:00:00 2001 -From: Armin kuster <[email protected]> -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 <[email protected]> - -Signed-off-by: Armin kuster <[email protected]> - -Refresh to apply on top of 2.6.1. - -Signed-off-by: Trevor Gamblin <[email protected]> ---- - src/bin/keactrl/keactrl.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- 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.1.bb b/meta/recipes-connectivity/kea/kea_3.0.1.bb index 5c46498d5b..2b4677af51 100644 --- a/meta/recipes-connectivity/kea/kea_3.0.1.bb +++ b/meta/recipes-connectivity/kea/kea_3.0.1.bb @@ -17,7 +17,6 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.xz \ file://kea.volatiles \ file://kea.tmpfiles \ 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 \ @@ -90,10 +89,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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228087): https://lists.openembedded.org/g/openembedded-core/message/228087 Mute This Topic: https://lists.openembedded.org/mt/116837601/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
