| Message ID | 20240801171848.3102197-1-tgamblin@baylibre.com |
|---|---|
| State | Accepted, archived |
| Commit | 6dbf9466f776eef6513847c5e546e4582203c50e |
| Headers | show |
| Series | [v2] kea: upgrade 2.4.1 -> 2.6.1 | expand |
On Thu, 2024-08-01 at 13:18 -0400, Trevor Gamblin via 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 <tgamblin@baylibre.com> > --- > v2 fixes the sed call so that it adds the right > '@abs_top_builddir_placeholder@' prefix into the resulting string, > matching the other variables found in that part of kea-admin. There looks to be a multilib issue in testing: https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/6252/steps/12/logs/stdio https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/9165/steps/11/logs/stdio Cheers, Richard
On 2024-08-03 2:41 a.m., Richard Purdie wrote: > On Thu, 2024-08-01 at 13:18 -0400, Trevor Gamblin via 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 <tgamblin@baylibre.com> >> --- >> v2 fixes the sed call so that it adds the right >> '@abs_top_builddir_placeholder@' prefix into the resulting string, >> matching the other variables found in that part of kea-admin. > There looks to be a multilib issue in testing: Thanks for the heads-up, looking into it. > > https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/6252/steps/12/logs/stdio > https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/9165/steps/11/logs/stdio > > Cheers, > > Richard >
diff --git a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch index 63a6a2805b..2f5a217d3f 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 f5125725e4e2e250ccc78a17a8b77431100e7c15 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 @@ -8,15 +8,18 @@ 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 450e997..c353ca9 100644 +index cccfdac303..20ae2e6ec5 100644 --- a/src/bin/keactrl/keactrl.in +++ b/src/bin/keactrl/keactrl.in -@@ -149,8 +149,8 @@ check_running() { +@@ -146,8 +146,8 @@ check_running() { # Get the PID from the PID file (if it exists) get_pid_from_file "${proc_name}" if [ ${_pid} -gt 0 ]; then @@ -27,3 +30,6 @@ index 450e997..c353ca9 100644 # 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.6.1.bb similarity index 92% rename from meta/recipes-connectivity/kea/kea_2.4.1.bb rename to meta/recipes-connectivity/kea/kea_2.6.1.bb index 19309ce314..882df3883c 100644 --- a/meta/recipes-connectivity/kea/kea_2.4.1.bb +++ b/meta/recipes-connectivity/kea/kea_2.6.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] = "d2ce14a91c2e248ad2876e29152d647bcc5e433bc68dafad0ee96ec166fcfad1" 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}/../${PN}-${PV}:@abs_top_builddir_placeholder@:g" ${D}/usr/sbin/kea-admin } do_install:append() {
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 <tgamblin@baylibre.com> --- v2 fixes the sed call so that it adds the right '@abs_top_builddir_placeholder@' prefix into the resulting string, matching the other variables found in that part of kea-admin. .../kea/files/fix_pid_keactrl.patch | 12 +++++++++--- .../kea/{kea_2.4.1.bb => kea_2.6.1.bb} | 5 +++-- 2 files changed, 12 insertions(+), 5 deletions(-) rename meta/recipes-connectivity/kea/{kea_2.4.1.bb => kea_2.6.1.bb} (92%)