2.7.1 can't be accepted as it is a development version, and the
automated version check/upgrade should have given you the latest
stable (2.6.1).
Alex
On Thu, 1 Aug 2024 at 17:34, Trevor Gamblin via lists.openembedded.org
<tgamblin=baylibre....@lists.openembedded.org> wrote:
>
> Refresh patch 'fix_pid_keactrl.patch' to apply on new version.
>
> Add an extra sed call to do_install:append() to remove a reference to
> TMPDIR from ${D}/usr/sbin/kea-admin.
>
> License-Update: Update copyright year
>
> Signed-off-by: Trevor Gamblin <tgamb...@baylibre.com>
> ---
> .../kea/files/fix_pid_keactrl.patch | 18 ++++++++++++------
> .../kea/{kea_2.4.1.bb => kea_2.7.1.bb} | 5 +++--
> 2 files changed, 15 insertions(+), 8 deletions(-)
> rename meta/recipes-connectivity/kea/{kea_2.4.1.bb => kea_2.7.1.bb} (93%)
>
> diff --git a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch
> b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch
> index 63a6a2805b..98400212a5 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 @@
> -From c878a356712606549f7f188b62f7d1cae08a176e Mon Sep 17 00:00:00 2001
> +From 18f84773f992c64e07fb82949552e38a01aace4e Mon Sep 17 00:00:00 2001
> From: Armin kuster <akuster...@gmail.com>
> Date: Wed, 14 Oct 2020 22:48:31 -0700
> Subject: [PATCH] Busybox does not support ps -p so use pgrep
> @@ -8,22 +8,28 @@ Based on changes from Diego Sueiro <diego.sue...@arm.com>
>
> Signed-off-by: Armin kuster <akuster...@gmail.com>
>
> +Refresh to apply on top of 2.7.1.
> +
> +Signed-off-by: Trevor Gamblin <tgamb...@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 450e997..c353ca9 100644
> +index a7cf355630..c3565f7204 100644
> --- a/src/bin/keactrl/keactrl.in
> +++ b/src/bin/keactrl/keactrl.in
> -@@ -149,8 +149,8 @@ check_running() {
> +@@ -152,8 +152,8 @@ check_running() {
> # Get the PID from the PID file (if it exists)
> get_pid_from_file "${proc_name}"
> - if [ ${_pid} -gt 0 ]; then
> + if [ "${_pid}" -gt 0 ]; then
> - # Use ps to check if PID is alive
> -- if ps -p ${_pid} 1>/dev/null; then
> +- 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
> ++ if pgrep -v 1 | grep "${_pid}" 1>/dev/null; then
> # No error, so PID IS ALIVE
> _running=1
> fi
> +--
> +2.39.2
> +
> diff --git a/meta/recipes-connectivity/kea/kea_2.4.1.bb
> b/meta/recipes-connectivity/kea/kea_2.7.1.bb
> similarity index 93%
> rename from meta/recipes-connectivity/kea/kea_2.4.1.bb
> rename to meta/recipes-connectivity/kea/kea_2.7.1.bb
> index 19309ce314..228d2fff34 100644
> --- a/meta/recipes-connectivity/kea/kea_2.4.1.bb
> +++ b/meta/recipes-connectivity/kea/kea_2.7.1.bb
> @@ -3,7 +3,7 @@ DESCRIPTION = "Kea is the next generation of DHCP software
> developed by ISC. It
> HOMEPAGE = "http://kea.isc.org";
> SECTION = "connectivity"
> LICENSE = "MPL-2.0"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=618093ea9de92c70a115268c1d53421f"
>
> DEPENDS = "boost log4cplus openssl"
>
> @@ -18,7 +18,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
> file://fix_pid_keactrl.patch \
>
> file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
> "
> -SRC_URI[sha256sum] =
> "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a"
> +SRC_URI[sha256sum] =
> "036bdfcc8b815199dc7c1d0edff01a1057462771b8c4bcc2f323c32bddf1bd5c"
>
> inherit autotools systemd update-rc.d upstream-version-is-even
>
> @@ -64,6 +64,7 @@ do_install:append() {
> 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
> + sed -i "s:${B}/../kea-2.7.1::g" ${D}/usr/sbin/kea-admin
> }
>
> do_install:append() {
> --
> 2.39.2
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#202759):
https://lists.openembedded.org/g/openembedded-core/message/202759
Mute This Topic: https://lists.openembedded.org/mt/107668433/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
