From patchwork Thu Dec 18 13:44:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 76929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07F82D6D220 for ; Thu, 18 Dec 2025 13:44:55 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.42248.1766065484030387462 for ; Thu, 18 Dec 2025 05:44:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=WtQbCBA7; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=44473d6ac5=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BIDRxMC1442875 for ; Thu, 18 Dec 2025 13:44:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=PPS06212021; bh=ZCFpiAAmKQbQ2Mdo9sPB qDBejDIJji4U66OuGdgqPoE=; b=WtQbCBA7VTAHgdNWeRarjp1b/KiizHIdkrdV T5RZj16Jw271eU2419UJl0eUHjLoPfKmEn68AbffxU7wDjLWl06H0DNcSWmod6oc rTsn0/RIdHtdwNxdNQ+375TojDPcUTHbjmKI85qP94h8lUjv7ppr9o1Gerk1nWzZ LR/ES7NoefloJkcQJ09dtUR8a/2hb6cl7IxFY+Bn+lIf2GlcC42d/W5ItdnyVhAS n+SOiH3kTYYV0b1PwbZu/ae2YyLCn5nXP+LGd1rR792m1s5YEkN2gKzom59GUhsa suwd9y7/wffDsotAtG7imTE+fIEy3NLFFP6aYT520qT7Jvykyw== Received: from sa9pr02cu001.outbound.protection.outlook.com (mail-southcentralusazon11013050.outbound.protection.outlook.com [40.93.196.50]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4b3k0bt130-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Thu, 18 Dec 2025 13:44:42 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KP2yp89+WfGM61eYODRLO7BvXsL3WcfuKX1RefGtzEq5XoKsWGJd8O0J4NAA2qswLQgKJsfVi4JabykCnc+ROFyNZcoIkWxL7Krg68zi2qqcIrEjXwNqdkOMnHeMEwh4rSgJsQmosRoJd83M+Hw/fMmdpthDahBi1URbbfQ4HGIg2gcZbucJKqs5GotHBOAfCPByQW/yXTZGhW43o+BKpJhk1WYCa4I0Dl0OJESw+TQdSobgEErdDrUZBh8JCXfXC6OAFcOPM+XoZoI5lIiYlwOwwuUZb5kn2s8JlO4KxnItpXrTlqReVg+jVJyDhwVTyd0IKXgwUPaH06RyU+Rthw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZCFpiAAmKQbQ2Mdo9sPBqDBejDIJji4U66OuGdgqPoE=; b=muDUDd4+S1V4m8QLPpuwA0wyp1hze/oHdur4LOT79gOwArGBQi3mDwN3/RLWbxaYMVWGxfonMZjqqfwmeDwT2IyunGODEmjctD2XfOVlNE5IlW2hN+5kgJ3rcg7us72909LS9c5rBPcg78NlY7Ey7zU+XEb3f/aPCHRukHrFeNifAUq379oo55uvyu2rtQkiDbcLpM/O4K8DbOtdyR5elO1S0UVO/WLTmmEE7J+oA19ndstQA6+cayY7oBtFhvSpqcY19EytD8DYF4Z0iYXwjGjvyI0xJi4EzPN1/FeBsC56+7HgxQjVagZJpaVyjNWxRW9/S4SI57lX8Q2a/2IRvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by SJ2PR11MB8516.namprd11.prod.outlook.com (2603:10b6:a03:56c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.7; Thu, 18 Dec 2025 13:44:40 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.9434.001; Thu, 18 Dec 2025 13:44:40 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3 V2] kea: fix creating runtime directory in service files Date: Thu, 18 Dec 2025 21:44:24 +0800 Message-Id: <20251218134426.4187527-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCP286CA0174.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::15) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|SJ2PR11MB8516:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ae90465-dfd5-48fb-491a-08de3e3b97c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: eURvLfsQBINl+vriiMIcZBtfc58KYtORYCBi14BS+1x+tKL5vlCnYSsP4gqfTVZo3oY9OccLGKa/Yq7ek/Mr+M2FMhro8L4bonVnppx7Bqo+tiLy7MEJxQgjz3zvWrq+XIq4xcEV56WgSo7f/P8Rwr4xLy1/IDoe3yhatGh57rZmSkhzzvsLyxNHxmoJHyt/5vUcxXxMeSKZLsKKZVxZJknPyshO78JFjpef5VscyNEIL6ikbzTn5cX5ScH2znQcg4P7Yw11ZvBswGNphjxdJf63F6drlK5miZEkCci2EocPfhsJGLODyhr827rUHRU10L5RvPOVHiyPYYR6bEyPLUa3u53epvnyC+9hAAG9LfTxHBld9vCfGVStbS4S2FsivelqFVRte8Jp73d5EN2ViOjKxbhvn2pNpwtug8kfoKGL6r6KXLqoGCNNvaIPBXuAGAsPFZTyQCyRHkwvVjTxy+gJHtrXGTV8xX2iHil/r0AKrJE5LedO8ypA8UGJOffesI5akoDnWRno+kcQSS6Mm8joqqiPMQ7p1ezXJiLzbyEq8bSXxV9NI2+bWz0Z7eK2c8Vo1UZz013PE4/2YWaT+21kIngwM/eE/G0Jm1YMnNdAtNIQ9IHVupFIvLqdboicXPzxt8Sxgf5jOdw5deKYh0ZBZTz52xkEyBL3/RJaxBTFY7zvxdWHtLoq+nDD3thpQNd2lS0QPmvy9MT8JWQrG3RJi9AkOZlZfSFfijCfhi8gWvmRjvgmVQl7tXOU7/uXp8Pgo7xhiu7Hia5j3R9WA4EmfTRYohIpOkGV5KWaAJnZoGVNMqLA2dWkH5V+J7euTWTnseSprvn0hRvWIqlP9dO1UgOzJvrKoWS12RrY4zKyhQqbAYSjVOd8bdJqV0BraZDbwqfF+9W2tFc4596bsRJigvojo/Y3GqHTmQ+04x/bcBGL3muksmt9492U29YHbdackipgzG/LV1IK2d+zVc5WCZNZkW6y1IbfXFqlT3Svk9W/R3upvdnUzLZU65fNfSANNeARk9ewwZ4N26NJYKy2XnxpXw580dfyROdjlRfkLjbXFERzMYvGxHSotJfgR5itEJmEgguOknjk+cc/ZLfTUhx1qmeXL+77g2YeKfAHkjjxkdXGk24wmhWwn/JlIBj9BvwOIiDl8s3lwc6ujmXDDyCPEO1tzBn8AuQeHJ32YSSDYqZWhZ2IQvdoi1VJ7HQV2GrgygY+AFBEoMWEPIH1nW8pv+pLF6DUf508p5oRglA8nAuGySUlNpIPS/FVMD1ZQuN+t+ZflSFB52zG35toD3BEJPMEWqYLJHcN/Nhc0OBx18nOyl7cXe9QIXjbdFHXbTIgUExhlMnfFR21oAqCVCB1faTBBN7iM7ico1DmtFGPK9Fmuo1Fn1jlyp7kpJovx2wsmGjz5YLwtWaqQ+MOFn8RM0OR1alQJocGXYSJMhcFbNaphkbbIWmyV4gRQ85IEHYJON4Xh4aPht6tnN2t48LRQbQ5rx9VepD7bTWuDQEan/JFCKaHv0701rZn X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iJQRR5wTbET4dXyvG3+0BmhEntE8ewP8J5h1bS74FHUF54p5bkc/p00qg5fTZIIoLb/UCwK5yKd+DKYvL2/o+CrAxt6K/t+MClkiEtAbQ8UsMAuStxKYUYookSxtxnZLInod0i+DYwZWs/KHpQkppynHBIGkuIOI/tqJxbBuTYvDdafmOAzs1eb2mdZVQ0owpLnno61z5KXVmunx/jmJyG+/X7nsJBZX/gEnzNiKmAdO690kvTY0fed35RbtZy6XTpAXYn0WBzt/eAB8tDB6x6oUamgOB+VzrWuY4in0JtDY2kV8ESesUh/YMgCRsL/jrRlUQeTgS7izMpr3xzQz2XILDJl/zhwy/yjbWfVd/IMppIBi6QSY/9osNqStODs8xsQXLBzi2pXNqpulu5V2aNrA0KuCAYm7FIt0hdVsxsOe9CGxkltO9Sb1TLjr+xvO9WLJG6U2fzUSs22yxWtbthUUKJf8ddiYu3oDp2clFmO2FkkNULQPcFuzvhhEo1jdLY1pdiMQ9om+ml/n7oEYA6sdYwuf8bBDcCJzer2dCJ+jlzkTObp9pqmKq5y1KmeDbD4uqN5soXXlRXKmrb7M5y5DOOUfA3fHcYJjcf01He5VHCVvrLxnkGVmJG2o3SUAUx6/r77CnN7B8soT2Vq0md3yZPdDyR+QwhFugREgK2uM7VaIB6x97iKIMoFTJ4VALpd2fMIEVv55QG/z6DxEz0+zco4IcUq3MI9fkM8B1aXdr16LJ5wgTNdqMXv6JUbzURRfYQwEUt3UuSdHlVR2q4Owj5tSjMgXUq9qrzndUqeM/EmkMkSp8Sgxm2reiG4o9H9egMiYOpSW6jDcKAZcMtIN2H245B+mJ4XpfyP4c1OBOSm9u6D1e0Qxt2GlvBX8nxQPmz9qCpK+VPYwWFWyh8RYM/Ck4rV2BC9qaJzLZal+Oq9uOpuyNE9o7izdXynK0C6owwd1869uq5xt35rF1BR2aFoo6bOKUUOLFgflJPyJYB7j27YzdGCzuYR/383ifwvL29QD2PdbvS3GztwZE9y1CHyzgLkWeq6SZtwNPT5VhPvQfvQldryioMwZJGvpAKsxtjiYFxEMhpcAmOVyLoYfnNu93PquMvj/6HH1gQdUCnqlsWla/WqnTpd/UETxwHy49hV1XgF2GV7eytA/CvOKL4cgwwFCGPWh26Bp7hlFZdUJUqlGhx7LCYab9gQRNHRYp2+hbCpDPcCebr0VDkQRqtZ7izjg5f5lmzTYZWHDmhZRqhvruUyXEET+Ih2oyb3HD2FtgC3osco9TXyUiM4E8mz1Qj6RMxmJ1KfvtgqvWyWh+O5dmCWd7zOviMQV1BG6QHcP94/wv8ECY+QFmiMFjaY6bSqCqjx2bFlCMj5TmJ3gi4HEQwfrRC/UM502VtUhtH0ZuX7bimtTUR0PqqHxVwO2HGuEweUiOBknFJbFm7pCH2cS+7zzsKLKGS9vlm+00BNtWQIjxBukXpO265XrWm5tn7LaXswjQHIfuUX3teSG8yUeaxyDi5FxOQUT4yVR5gPMog7OPYK/T60eO8hsIWjYOaOzaBpyHFtuiFbMawqg9A/92NRIEDXoFZYK X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ae90465-dfd5-48fb-491a-08de3e3b97c3 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2025 13:44:40.5104 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: M0q5gGNYOG3mU5pMr2vZPEwA55awySSsNzgPBjxczlMyN9DO35dQHkPkCFQVnAmhU2bHkj5FRfxpB2+aw56bKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB8516 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE4MDExMyBTYWx0ZWRfX924YESY3ugPj u/JVvXD7Vw+4wUF9LzexEPAUPr1DSahfYFwnRB0tRoMIZbgDXSYhHaXcIhvbWeKHMmna6pNipJu vCRCDcch3HnfmA+RpstLS/Ac6hTkIBe9mmlw+WJ5AFeJdjKSyjtjSqnUBGRhBfJh6kpNMUoKaP4 IAkdKNmuQ8hpy2GZMpPKrV84waFCV9RMEe8IvnFne18vohK3FZh0ktMo38m5N/vJZA9ddhMJl7M Q4G1Aw5W4SPbh2i9mJIJQIKqdmzcvKprWCUCR81HPUK95bAozFOkRLIpgDmcKF1d9OFVQdWCOxD kOczX8sEjJjK2IyvK64hzEbLZso5AglnbVJhYfH9TdbDfi+XRr4MR2BnAz0ySBlunm20a3WCrrJ R9wt0OINyhMMedA4DDLEjUqZg9Z7SA== X-Proofpoint-ORIG-GUID: ZVqqw4vc_HNtZNTc-huvgVqLbhl7DbsD X-Proofpoint-GUID: ZVqqw4vc_HNtZNTc-huvgVqLbhl7DbsD X-Authority-Analysis: v=2.4 cv=C+HkCAP+ c=1 sm=1 tr=0 ts=6944054a cx=c_pps a=TdY+Vr9RQ+qa4geS/iuwdA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=t7CeM3EgAAAA:8 a=IofoVH794e086RA8f1UA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-18_02,2025-12-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 suspectscore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512180113 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Dec 2025 13:44:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228122 Create runtime and state directories using RuntimeDirectory and StateDirectory in systemd service files, rather than creating them via ExecStartPre. Signed-off-by: Yi Zhao --- .../kea/files/kea-dhcp-ddns.service | 7 +++++-- .../recipes-connectivity/kea/files/kea-dhcp4.service | 8 +++++--- .../recipes-connectivity/kea/files/kea-dhcp6.service | 8 +++++--- meta/recipes-connectivity/kea/kea_3.0.1.bb | 12 +++++++----- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service b/meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service index aec6446f0e..feef7e0b6e 100644 --- a/meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service +++ b/meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service @@ -5,8 +5,11 @@ After=network-online.target After=time-sync.target [Service] -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/ +RuntimeDirectory=kea +RuntimeDirectoryMode=0750 +RuntimeDirectoryPreserve=yes +StateDirectory=kea +StateDirectoryMode=0750 ExecStart=@SBINDIR@/kea-dhcp-ddns -c @SYSCONFDIR@/kea/kea-dhcp-ddns.conf [Install] diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp4.service b/meta/recipes-connectivity/kea/files/kea-dhcp4.service index a2ed4edb59..ce1256cf26 100644 --- a/meta/recipes-connectivity/kea/files/kea-dhcp4.service +++ b/meta/recipes-connectivity/kea/files/kea-dhcp4.service @@ -5,9 +5,11 @@ After=network-online.target After=time-sync.target [Service] -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea +RuntimeDirectory=kea +RuntimeDirectoryMode=0750 +RuntimeDirectoryPreserve=yes +StateDirectory=kea +StateDirectoryMode=0750 ExecStart=@SBINDIR@/kea-dhcp4 -c @SYSCONFDIR@/kea/kea-dhcp4.conf [Install] diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp6.service b/meta/recipes-connectivity/kea/files/kea-dhcp6.service index ed6e017d0c..6123a8ad58 100644 --- a/meta/recipes-connectivity/kea/files/kea-dhcp6.service +++ b/meta/recipes-connectivity/kea/files/kea-dhcp6.service @@ -5,9 +5,11 @@ After=network-online.target After=time-sync.target [Service] -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/chmod 750 @LOCALSTATEDIR@/run/kea/ -ExecStartPre=@BASE_BINDIR@/mkdir -p @LOCALSTATEDIR@/lib/kea +RuntimeDirectory=kea +RuntimeDirectoryMode=0750 +RuntimeDirectoryPreserve=yes +StateDirectory=kea +StateDirectoryMode=0750 ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf [Install] diff --git a/meta/recipes-connectivity/kea/kea_3.0.1.bb b/meta/recipes-connectivity/kea/kea_3.0.1.bb index 8729b1162e..1be557c79a 100644 --- a/meta/recipes-connectivity/kea/kea_3.0.1.bb +++ b/meta/recipes-connectivity/kea/kea_3.0.1.bb @@ -74,13 +74,15 @@ do_install:append() { ${D}${sbindir}/kea-admin rm -rf ${D}${datadir}/${BPN}/meson-info rm -rf ${D}${runtimedir} + rm -rf ${D}${localstatedir} } -do_install:append() { - rm -rf "${D}${localstatedir}" -} - -CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf" +CONFFILES:${PN} = "${sysconfdir}/kea/keactrl.conf \ + ${sysconfdir}/kea/kea-ctrl-agent.conf \ + ${sysconfdir}/kea/kea-dhcp-ddns.conf \ + ${sysconfdir}/kea/kea-dhcp4.conf \ + ${sysconfdir}/kea/kea-dhcp6.conf \ + " PACKAGES =+ "${PN}-python" FILES:${PN}-python = "${nonarch_libdir}/python*/site-packages/*" From patchwork Thu Dec 18 13:44:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 76928 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07ED0D6D226 for ; Thu, 18 Dec 2025 13:44:55 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.42217.1766065485512640449 for ; Thu, 18 Dec 2025 05:44:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=C6pEpG5G; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=44473d6ac5=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BIDRxhQ1442866 for ; Thu, 18 Dec 2025 13:44:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=b73ah8NGTEdG8gCMQtPx1y366dDq5aiFb7ONZGrbOxk=; b=C6pEpG5GRa5m eaSjfMEAyxI2otKWXnZ+pi1fHftulqRfUtY/+PHi5KXemWgOgRRH+PPE+xiuJgSU MIbdoj0gf67yX0z46+orTlVwDu9sPYbBWDrOEL6N8CM/8XSpO++dfoTX+MSofeqU sFKgJ1DFausj7CFexyZnulM4Ox8uBATY+YvKNewBNjT6qG7QySLgeXHbAgzFNHWl 79zPb+Tuy85kaJB+Murmun0eZ/cPZ8nqs3x5+6vWmCFnsnhCt7mNEDb5ZOMiZiCs 8JiY6JsEijPCTdiBRXllbte4BFF0LDA+zJZ83Ujz8537bWOeWmtB9aoTGgZME+gr vD2ZHSeprw== Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazon11012031.outbound.protection.outlook.com [40.93.195.31]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4b3k0bt132-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Thu, 18 Dec 2025 13:44:44 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZS66leMSmtuaLa1vYsho2xsqFwMxIRjmQwnkQdYMA//YXyP/TKmRxJqrPTk1Vv+kpL5vC8D7sG2lqA05c+OXkOHwLOQFWj8/BxcqO4jP6Wa7aytxv2bJqhQX0uXJ55yvGDP5Yzk3/SZ3yqdQ57quaBInW7EPDmrooibbv75JuqRBHyzL+gEMTXOrjxWNRc/BXR6dS2BGTFIzKh5omEGH+XVLZdTZMM1Qfn530rfbKsrLFV7K23W0WbwwH6u7kDchssmRnX3r4d+UgospP3PG0jRuwGOkWbVArAXQOaAuualnlyPPh9zHJw045EG/oZ3dA1g4ZAIPG8moUeA7t8JdNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b73ah8NGTEdG8gCMQtPx1y366dDq5aiFb7ONZGrbOxk=; b=qFID7rSq4bvVNs9vGZsH0IqcpuqHAtFJY66edt948GUw2E0g4z5MbUciNxCWEBI8owNNxxA8g/qcWk9cW3e+hecDDlVeEtFQI41ZJ3DVLMV6ZZHXAMyw+9/QKf31J8/FtWqhe5GDl/Tm1fHXKE4GfhS9z95hZLM5onzHzmxm7oZSSKbNtqwtwktNddWJdmSZ3R+lZ7SLoejZUPgI67sLTmR70AeSMOM6EJxwmKvegK/qP3i8isS0aP8vCj3kgSJwTJznmrvSJ2EnmuC4mLKMfATKPH3/kTidxS07mJy3fZ97+qFrusWOcgMkkR8SQHR/Ec1YrawUOBOtDx2IpDhePA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by MW4PR11MB7030.namprd11.prod.outlook.com (2603:10b6:303:22f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.6; Thu, 18 Dec 2025 13:44:41 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.9434.001; Thu, 18 Dec 2025 13:44:41 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3 V2] kea: replace keactrl with kea daemons in initscripts Date: Thu, 18 Dec 2025 21:44:25 +0800 Message-Id: <20251218134426.4187527-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251218134426.4187527-1-yi.zhao@windriver.com> References: <20251218134426.4187527-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCP286CA0174.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::15) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|MW4PR11MB7030:EE_ X-MS-Office365-Filtering-Correlation-Id: fd9c50e5-7ecd-4e46-7572-08de3e3b9873 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: GMtPAMSrg5k8LWvyL8bWa3J+VDj84PkzAWWO2U03mGlmEs9wTcdp6iNAkM0hyejde4451DIJq/utwDbbkn2yyAPw8Ew0y9m8N0Hc+/PahVPukyXdVnUZhG2LPqRL1E7qpg6uvTLCVDFpG2akeFC9Fa69uBYmmfvnC4Nt9FgXf4UBpNVSnVmRBhFIOK7RPqNdoB/vbvC2o2COMrCmPJfDUIp9LPEAX1RFumWWSdRgN3SBJuiHugbrNVBjld3NDGZ/8C+LmwFUXM1+wbs/ZbwWVRU2w8QVBMYp5b0ONvzRHp86awgQ+KyzmzA7BNGUOrRdBLflKdTsXJkrTiCWywl3N4xoUZ9gi7h35TFQXXjGh3C2xJPutj4m2roNUPHLpA3BFEjEJ7zT6F1F2xPLaXFSnFxhe28pnzQOAuxspaudwxZqJ9Z99K13Dkte4LxUGQq1vAWcZwOfJb6HrqLs19u9cQBTa1HOPrwGCxBsUzF1MWM3KtFRP4DzsUBo14Lv5YawNybbQ7dhstNst0g+2tyJxELFoSkONd64hToKxbmiRXO3SGzAKBuT/16Oo+KJf2fk3Xv3pkhgIevZSzVZaHU6rIjI1v0XZDksVL16+oZR489fU1AFsVzcy6yAhrQxODKslRmdLhK91flY84JQxQ19gIVVbsY5MZdLKfGdJPqizUIliFnCxh9frVFQ5Z6RfB796aIzNqoh57EGgGeIjcOFlYfA4zBTaiX2DR2+snYkcLJLh01WHS836cQxn2ouDWaDsQOzz9jxO6cpJPMsUA0JaTZidBTsu/wE2Bby4Fm9VfBL2O+g6rrW6ERIlo1XIC/eR70ApusrCgHMgMC7O1U7tJXlv/t6+oS+DdNhRZT3HkHXXqegrOZmzcsD9iB38AmLHE0cIczcp5sQd/zE36sIXGe1ryKS0ZjpusM3CeLEzX7koAcDKb+CDtydISBOo0+GahQQPQ8ueX4J2EC/86mLpY+Tchnu9qAZSggsH73EmBFraQkB9YdrbjmG+2fbzRC2qrLTaFI0fLZ/4SJNN0EO8JccxHuHWrXno0XAPTTeJ1mT0djoKq8y+ct6LXmsFPWBehfmzf/NfMLcaIbF2VBXUaP4ifMCBmWPK8EZWgbwxFONFhsSRFSV9gGakxgzrEG/BhpVEbJkMbAm+skMSBsNz7KbISI7VdvQZAURHiYXH2Kp+jB7jx5CGikBFgowGvuH8aK8zQ+hfp1xjuzzG8lPF3SVZmqfYGtPGin3HFwrPC2GCnqUdHMhqp84F3kn0JaMJR8HVOHm+p3f7IuuHfmvmaxjf5IUqCZTIrhOdt80W3dCmXRxWoNL8Hnf4Zz0m/+ywQR0tRBgqtpJ81V1LWnNIIcdMZZJ/wjfu/X8rxqdy687MbSvSkpsZC35hK50cGaawuFFHqN1s61/o2RHlW/iMTyN+DnZYBUSIue5UZusGvlZxNngdEXcazeVCcqae3uJx/0k/7X/esWogsurkOxxHQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tdSBtL4HMZjR1+w7czLTbkXp+KgFIwLj0seUSzG2YrtHkg9hJ1x4hjRMPjmDyYZUP6H5hjPdprPon3uYcEXhZphn+ExdGGmmPoIqEDOUsvWZHPowQtrcPjIm5IuhDBK6WEH/9V3UFfi2qhBLwLGXUWKVVgrlDVufmKFM47JCvWMGDkvs16V9LuUePf752SurEOVszaCH8p5X7T1FYHInssP4Wh4eymaTcgzuqGuoplCsj8SLYMd7/RLsNf3BtBBz25ha+4DcYSLUlvmHKONtfIWn0NAuIm6bohQrNRcUJ/srAdg2cGhnZSaZk7v8tZ1lbvh2xGYxxucBLqf1SQNyp01k1esLkXB7JI5quy0BbtC776vdRIX+RhUGhuHtt0xEOs4QzlrvLpgnCGf7ox7ph4tVg/2+VeD+ZjuZRWsu8sgpj3I1/CNCYuxlYlz4W1tlK8VFZh4XDgD3JtT9ozP0v6wqNzgjcuJjDkMPecYA+dQ8Ji+GAlonaGSEbH4zam/xNm+JpzDMlP7AKIq1EMdlDqhmvtwc5bmle6aIYkyI0qyANKttI5vIXLrOFhxGhWTl5Z3K8o99Qtx2enex4+G32KMsmkLdZyyh5wTXo43yySsI1NUQGEyqWLhPUK6Tw+jU3wvtSfEUyEFdlYYTa9Bda8ztCs0jSC5IXQE01sZ+8VyMiIPnXdjEKIb6uxFawt09+2yMGrR0Gm6WeNuVj4DwaDbxx5RRPWgeHW8zWloaozCkDgoAM/+hbAjguNy00a3kfZN9lt2Nip2IcH1jXZUPq7jcAepkGKPGnb+Z4vEHsGUoGzo83zMBgJYouZOnqMqwuDF2UdD/maww0bqSdBFfwXbrTw7IRGI7TVLQdIvk2NzVi+BTlbYumEFgDRxRmZE2JBdogiCT1BD8D/NaOCIQzGSEirp0xszVsCOQrAp2mEC2bD6YVgt71nzadNEUM1c/3hcS70zer8cSBGaWlGAA9E1+sXv2lx+Fef5PergAiJGP8eAQY9vb62gpnb30oGKVMMjkUtx4e6eZlU+ILRBElOfrx8uKI69zrhWs+WP79PxMQAWf6zLNAItjzPR2ErdENM0ATrjxsIDGKegkot3Dx60LMmfrdQxg93OGRT7/AKJyA9D2fZkfIoCb9CX/eSVYTVk8oU3pcarJ7mDeIaBlit91aSYQPT7fQgbmzON8KdICkycRdmUq1FrGfXptKCMMvGIs3hTmxWNf42ulwwntq0a0UXQip8Jrle0+UeG/BfA3Y+mY2i5w98AkFfct6+AETg6KBVpD7RK9yAhHipMix5cxoiJVc6l05C4tC5bfg+oyZbXHUlPUznGA9maDEDAMuR2ER2MbdKXj4iN5rsdg2PdcFvWuG1rOAY9zVhhV5+OZeeAdaSp3UUpm/po7obccrECFkXYVTt0yIRUftjyYqJbxKV/CXH+mgW/xNVIpnyggCA2gRUE5ftvYhVpPQH7T3wuVTCYDk+x/MESzmQVlguWpTF4fNkrsXEcp/EI9+e4hPDqy0/EvZDu8sf8WVfb/xBxwTzbpklFSq4bJRkvjnS0+s/k90einXRK5PB0EwTS/ON96swZhwm6O8s5OwaO6 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd9c50e5-7ecd-4e46-7572-08de3e3b9873 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2025 13:44:41.6642 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: F6uNqh3kbT7Yknld4ZKPI7dHjYjdFpodPMPxIsa4SUN4VJYruXFbsgoIUPamJ/MbvR0OdS6g6TUVcqb4EBhO9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB7030 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE4MDExMyBTYWx0ZWRfX8pbXgLJjetri j5MManjyB/9zkpVCvB0NdUCP91d7N+oVNH9Bbs1/OV4DlvlsEYAK9KiGfMXlJGpHVqGybYzVpjs 3+LS8oBHiYCX27zoN3z0Di5s+f2Y5peEAvdZuJNwqBuHtNuDhn+GoQOnRODBRxIeCEfzO+DfnuH W+2hPI7AEbbBhiZ0DxIv3Ye5pM8VB1GsFywluoUVuEq7JOoeJvwfqU0qxqR8KxxChTpwsRqu/Kh PwPmuBPM92GNEYifjoZdX+aSP8QJFScbZyZ7qJnNFbm1oBZrKWEZRBQ5hHe4H94xQHtTtsRfDZO fWhod2jMSqOocAkbyZ3ZTQ8EFc0EMby8ESB3QmHv55gtk7hp4PyE9j9U2cnRWt3DqT27OWDmAZ9 4K/dCrMb+z8UxfDk8NhsC749kyl34A== X-Proofpoint-ORIG-GUID: -iQQkwVGcNksECkNVRFeRF5FhxJ-yLI3 X-Proofpoint-GUID: -iQQkwVGcNksECkNVRFeRF5FhxJ-yLI3 X-Authority-Analysis: v=2.4 cv=C+HkCAP+ c=1 sm=1 tr=0 ts=6944054c cx=c_pps a=+CNvbeBFiKBwJ3WcPfu9pA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=SCo1hh1FAAAA:8 a=UXIAUNObAAAA:8 a=t7CeM3EgAAAA:8 a=xM-FUPNtTvUpdSPhqdkA:9 a=MN5MmQDxNtH1qPK1:21 a=Hti1SrPgC-EA:10 a=nwb-CePKZZm3gL-ai9HY:22 a=a1s67YnXd6TbAZZNj1wK:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-18_02,2025-12-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 clxscore=1011 suspectscore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512180113 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Dec 2025 13:44:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228123 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 directory. [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 --- .../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.1.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.1.bb b/meta/recipes-connectivity/kea/kea_3.0.1.bb index 1be557c79a..6b07ab8a4a 100644 --- a/meta/recipes-connectivity/kea/kea_3.0.1.bb +++ b/meta/recipes-connectivity/kea/kea_3.0.1.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 \ @@ -61,17 +62,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} From patchwork Thu Dec 18 13:44:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 76927 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04AF0D6D224 for ; Thu, 18 Dec 2025 13:44:55 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.42218.1766065486113393683 for ; Thu, 18 Dec 2025 05:44:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=e9bqSl0/; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=44473d6ac5=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BIDRxhR1442866 for ; Thu, 18 Dec 2025 13:44:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=5NZQQfrmlzwNWjgNTK/JUBXypEvVZIcXWIA1i+V64Zc=; b=e9bqSl0/SeoJ oIJbRG3nh3NVPB9fLARRSAgq9uLt1kphN0PNbkS9KWCfBMMQmVty4PO3J3S6U2uL Jv66JMYPaU3/AqlwWIprTnI4k7nOeDxsDJApNIatsw+iFAKCoEMJmcxufSZOYaK7 7Y1Py32ekHKEj2cekJQwCGR/HqlSeZx14VZv+Y+inm5fX7QBfpLFkUqTxLXM70pO wKsog7pNFPToqsQ2KSfJCTJbz2gdIy2XdtplwpZiwD7P20duh+eO4m+DL5nTyfH2 SDQxd8Io68cQ3eL5TlrJgcv95LnOuBETeQj3mgY1jlkOQlEzEx0FGCL15tWJrL2R TvLXjymmjA== Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazon11012031.outbound.protection.outlook.com [40.93.195.31]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4b3k0bt132-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Thu, 18 Dec 2025 13:44:44 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=s1C35bntRer/EF2PVQQMGKQxB8jJ8yMVi4oNetfsmrDQnzKse1Qe9t+1asKhN6MjYuy2a8ezY/0z2f/LUk4o2FNS36xpemB2JgJfReEkK1qlEXCtudtmUs+Cah8iUWNvctqNnc91eioVv+lTN8k0tEkl77+InwcLfuh8UNCP03+YGMBUS2VwB1B7I2c/k/uBEq/1CPpRze5sTPCrHAfxHwH0LXRpEC5sYG1W110r8F7cZDPHYzY9NCm/jN/hD3r55cS1JVDgObmCPH3t2eeYfDCl0UQZbZNI8BzA4tFZaK0AhPMPeEHKG+gvKZ1nPa2G4BUPBYEB7dn0+J+E+QCTUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5NZQQfrmlzwNWjgNTK/JUBXypEvVZIcXWIA1i+V64Zc=; b=VKZpUVcoW5SXGjzednnMW6qF/r1SFNWgMivL57ef5q0HuIvfZAge4Y2ZO+thNCb1oK+T4nw7a8CXL+majIzjqePKXXT8mAsKKgmtS0HAuRD42n5W8D6lR/I1rFUhxM39+EBEI5S3P2s6hrQSBJgYMbvvWE2PQcR+bOPsrNWEFRsY1MCydOlLn4wS8yte3KfbQpFhC8jru34NWvI4VWXTsxy9BeQD/+eob26pBDfhy73sJyfxzCwKay021uJTSS6qacDKIh6htOQsxoYOXDQzixW8UAptHwNj4c01Ip9RX8JWGme6+3m/uOjudTJ4hKn+5MhU12ElSKIwpgbivS4CRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) by MW4PR11MB7030.namprd11.prod.outlook.com (2603:10b6:303:22f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.6; Thu, 18 Dec 2025 13:44:42 +0000 Received: from DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad]) by DS0PR11MB6399.namprd11.prod.outlook.com ([fe80::2b44:787c:e7ee:bfad%3]) with mapi id 15.20.9434.001; Thu, 18 Dec 2025 13:44:42 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3 V2] kea: remove keactrl from package Date: Thu, 18 Dec 2025 21:44:26 +0800 Message-Id: <20251218134426.4187527-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251218134426.4187527-1-yi.zhao@windriver.com> References: <20251218134426.4187527-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCP286CA0174.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c6::15) To DS0PR11MB6399.namprd11.prod.outlook.com (2603:10b6:8:c8::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB6399:EE_|MW4PR11MB7030:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d673092-668f-403a-4025-08de3e3b9924 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: qNdi8k/a7cdk7J7RO7bb1izJForEatK/0v4UsVShL6JywEdZXJ1CvEtHYwsL4mhVv8oOYvvtxFfxhQsKhMq8gseWlCb/HIkK1Awp55GEzisnFwc+X59HduZM6s5yAsCzMWU74HhT8sJNcouCA6MfknBehM6HmC4e7287zyt8kzgrvJ+vtE6TMqcX2v1ClVklklmOYsaTlHfyYw9amua1glh5FnkIp7Tm8SMrJuUgGT/wAx0224rNIAzJuoucRw0zLBVqK80+9M9oBtu8fAgcyXW3562xigjrpNFAQ6VTfGKianwXQa9wyugKyYsLHB0IDnTvM30AVRULbtLDnkF83AKBxouPj3/JRSulns3i6W3LTP2hifuV/Amzt8L60WmnU017m0MiY8gaBWpbrHHMB54n0LgtZLe25V4AztGeIqnb7hIehbxc+BrFxYHq6OjWjxjNGuCx+M574vpuaFmP/DJeVj0p+dPlDfsIyc32qyLcjL/VIB9BJ8l5pwMI94hFIH9PrKAUWYZ/Uc9A4r75IoD7PbFqEDlniLTfRWFUB/M60AiFcpKrhmelMmoEnLrIUrjwQPXCddvP0uILlE9yj2I466lG8ueW4iyzLltSs8t3W/tmm5X8/4bX1K8LQwiWMd+QL8jWGEBzCLGVrGHcuclwZGwqLXjWJfZ8JXqRayTpl7CC735Teu5uF4krKv0ZAeDI/WLGIcU5Rfw7tmt+1UQRaDFc4/0xCe1Jq8Tfs+rIICHdnHMQOJDC4IhAK4SURSyIbnm9N52Hp9xzutyG+bXXktBaZ5jL+ETzWIxMotUzS4PEaJM2mq/+rb5/q5sWHUH3hgpiIiu14gZLkyqMQdWjmoQ47lQNu0AD5HNyIExDLQQe0XWfB5n1l0/ax1NNT2+Lpfo5msSi6b3Ydepj5Gx3ru1m9JXVerzPobSUiDuO5IHhKNK1I+H6DdoRqwXmvdO1XE9LUrBx0Ws/RuUhh5SJwqp8CtYpeNpjRv3sjutOA5jpasiRyBGEo7ExN4m/BeX94G4EgHDFrSF2WtG6fcvOStMBI0BzLHfW8fJKKOjSk3lumH7lEtSc4a1NfxiIdYQfXb+UYOdrfkKQIwa5Oal8GWUFNpJaddhGgFsi4Kvn0n/cDxPpYsLvaOi3pFCAPGLp495WbuNfCU7IrhJatFAWnyRuvgwzOquQWZyRH1lAGvrKdK6VVGu1VF7Mf6v75Up0qacb3zkvmO5uK+FNPYlNsF5Ssafk/45lFV/FzvDoQ0dxajM3muyDtcqtwEbbCOdhEHVJnDzF8hShSxyppReilYY9E13MBQVRgEPQ1nufLjSTA34Qmt7T1dFXWs8kerFfzF68PJydFAqCNmoFipfzelApus6HsI/seF5uGb+yoPRhZofk3iQnmOMaHCvDZRQrAursf7C/Wm3e7NGOqb8d6gxwuk2srzmys70saks8sd5qWLVUCMgkKwJaVt8MVBZbaPGUSU6FHU+FLf6K9g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB6399.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BhrKfd8uo6Nyiu6r8L5WrJEP4LrcdeZei471LgCUcSYoQ77EVtGufKqltisiwt5dOw1aOOrRaWsvh+iuNR3T1SgvjDSKR+DhFjUAoPXy0ml3J4j9F0v/6EElr2O+W3poazTVsXtT3Ar7mT24qVnKuyRK4UUm5Gbdq77lVQ5njKsiVO9RhfdYQSaM9QjI2KuI7fmUtsdkqBxkzxgLJnheuh+J/3K2xGRagzdQJ308KN7ok6E8JjzeoqZ5wGL20kwKNzlGPrwnitwdWgExDash5N78Uya5KkQS4oPxGy7y7xJc4QAmKgXZS/R/qj+bn8JSUQJYVv8Os7aN7ZCc0Bf0HQBc/5FxQMj4rq+GQk9870G18zJLIQhTHZsOtWdlL2vXASEyWarmQyH/EUHhs/eZYFlty3gBIHnbiMKlBv6gPV+blwZO4x+bGWShAxqaBRJ3OyIbA7uPwsXF6SWfc1oHcSUeQGM0N7F6vHlMCx/dgbELg7PvzwZWAFDC5VOGkYE+J49XZXWGO1c370qzOPx5gR6558nYz1RCnidtqZV0MStwN0k2AcgKpgadwTTyeySn6nBO7/BLCbt2mjV2eldUQsJk3FHjRCO9xdPY/DErRLfmft9xnPf53G9rywWngzGLkTdGAPaouEyZeynRUnV4I6mSOqBOniWPr6MGBPKqhZjYuHIeROaCD7b0yIG5vWi2dytA80HRnGN4wjVEcQzttGk1ioz97sxswZHaPnqrfIU298KCY1Ha54lkU3MqPYQPI8zJibJw9djyyjZWkT7dYtr1SJQ2GBoOY3ovJnLYLAa8TgtRWCmmvK6I1uA/qFA0ogz+j1bqT/D5nL0hqmqmTNgLIEpqn991CJFtK7Jl0wi1mvOTvBX8UoPpR3XymQ6y5I44iTWsYms1EiVwEbGcobi9UsDOGCxAqZ5Mh4oxd0j7p08dFaxeB9JflVmIXlVjUFdIJQxKahlnO8UpPuFZ5MyBTSscL6zTWM1ful1yWVHI9y5BPp3e8OrSbMvvS+PH9HG7bReCZ57dp2zdwUi6sEauNg8uLajgBDQZqPadOEm1MMvvsV2y02PukCgGrgvJSM+9JBz29A113i0l7PxfFP9L4MYktaehdRjjMfN+t/+AJ4sZHOUcj432mfWG8vWz0c8UkAuZIFauERbZTNpn1xJVZD3fGgz5r2Y5A0IbkuTrpGvIw0wPTEe7guk2qYtIuf0hjZahHngM27CkwMx638bBq2s2RUPWtPCGQyqlwb2XTKN2n8Mfk+OtpZlZwyl1saUteeq/pueI6YJWKt7FCUUdNmND0EDUBJcQLI5y6zc8TLoQ34sXoXJ6iRTf7sG6URzi93p5qH660M91zazCjXAmos3M60xgS6Y2MAqRQiFBhM6jtes1P4JZk8ydEy3KgzxhTDMQwGIHQYqe/ew5KMdm9yYuJsaxRmUPR8gbXtD2nHVNkrGNuYSBr7IVmhnlo3tPiB20SaCUrpy49Hdx18Rwf5riZDWrSCCpBnWtvOX8Wav1ztSiJv1gMhp2/Fls4C9Pu9j6MCfByz9KhHp/+dlrbSalwSStfjBRh0wnBzdnEUD8bZ3x5iXGBD8QQrkF X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d673092-668f-403a-4025-08de3e3b9924 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2025 13:44:42.8060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cI5ncY3i7rpZsyczu2Hd2e4x6f2F/QpjJ3x2dn+hrQ9MZUic48krGpGUKWElK94mtq6trqyu3sNvy78pErtdvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB7030 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE4MDExMyBTYWx0ZWRfX1HcUZ4gHn0NC 6GEBlidfeFKLB5xvbSpjEr+GA9pMg60iPvb09hMKYbzJKrjM3ADcX7dh5TTUJV7RSEK2Bjr7Xrm TC4YIgcuwEoaJycUniWccIqAQVTFjJLN2WVNfeoFtw24VLzbBlBtd5+ZURBRcPW9eL7VQQ7J3hM sKm3KNkwhSWzeLDb0kCRu1jrNTgRJUxnguhK87iVG1uCN1RrZJBQwrRoDEzQ18vtZcepCBOpUk9 AbqZp4mMWRxwj6GSh7pL+Sr4FopoYW32NoqVgt7SXOKbICjH3nTe2An0DeiCuMU4uwNW8UozOOC SAGxfLRsUxElFy+hQRtTtCV58ofmcH58ZOKZ86MtdQwbqgzFXyMnFlMtv5ZEDYkgI73VZYqktwZ gmCW29dIiAwRc6cthXQRHTo95+kSKQ== X-Proofpoint-ORIG-GUID: JKbOV5yB163sV7Gs0d1ftcNJ4v_a9uEh X-Proofpoint-GUID: JKbOV5yB163sV7Gs0d1ftcNJ4v_a9uEh X-Authority-Analysis: v=2.4 cv=C+HkCAP+ c=1 sm=1 tr=0 ts=6944054d cx=c_pps a=+CNvbeBFiKBwJ3WcPfu9pA==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=z/mQ4Ysz8XfWz/Q5cLBRGdckG28=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=xqWC_Br6kY4A:10 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=SCo1hh1FAAAA:8 a=UXIAUNObAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=7CQSdrXTAAAA:8 a=IpJZQVW2AAAA:8 a=zBe4X2LmVUuRWWPHscMA:9 a=Hti1SrPgC-EA:10 a=nwb-CePKZZm3gL-ai9HY:22 a=a1s67YnXd6TbAZZNj1wK:22 a=FdTzh2GWekK77mhwV6Dw:22 a=a-qgeE7W1pNrGK8U0ZQC:22 a=IawgGOuG5U0WyFbmm1f5:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-18_02,2025-12-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 suspectscore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512180113 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Dec 2025 13:44:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228124 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 --- .../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 -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 - -Signed-off-by: Armin kuster - -Refresh to apply on top of 2.6.1. - -Signed-off-by: Trevor Gamblin ---- - 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 6b07ab8a4a..61b6158de9 100644 --- a/meta/recipes-connectivity/kea/kea_3.0.1.bb +++ b/meta/recipes-connectivity/kea/kea_3.0.1.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 \ @@ -86,10 +85,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 \