mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
kea: upgrade 2.4.1 -> 2.6.1
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
(From OE-Core rev: 6dbf9466f776eef6513847c5e546e4582203c50e)
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
a211f058cc
commit
33d2c9faf4
@@ -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
|
||||
|
||||
|
||||
@@ -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}/../${BPN}-${PV}:@abs_top_builddir_placeholder@:g" ${D}${sbindir}/kea-admin
|
||||
}
|
||||
|
||||
do_install:append() {
|
||||
Reference in New Issue
Block a user