From patchwork Thu Dec 18 03:38:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 76868 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 62F70D68BDB for ; Thu, 18 Dec 2025 03:39:11 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.33366.1766029144303019177 for ; Wed, 17 Dec 2025 19:39:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=EFH0S6gu; 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.166.238, mailfrom: prvs=44473d6ac5=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BI1Gv1T3177379 for ; Wed, 17 Dec 2025 19:39:03 -0800 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=bYWl1chsQS5rOzoL6oM3 /twY3yhaBlozK0swXdyqdIQ=; b=EFH0S6guImGL5PRFAbvME/kkItcVzWQthtH6 sQkju5MwtemxqDL5DnFqernhCeNnOeuJc9OFjcJa/ZUcDoyQFkH5g7SdHWxlameS 2akXCJhSInmsOa/pDjP6rR37qMvzIWceTriUVrFbUgdgoCaUl1JCM4GYapXQbp0q WCEXdl1aVtIjkvXv+eRIs1r5hVYzMAXMR0Of4+K+oBdZ9gisuot6HDoTlcDjHY/5 ivY3HruaXCEWU5hDw9QoeLUKCKyureroPOpTAaMQk7gv6/X8tfzNZ6RyZoI56Q5W vKzFPoFoG0+9uDno38hDQqscx92YKt1+U1OrK0yOdaN+b6GxeQ== Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazon11012008.outbound.protection.outlook.com [40.93.195.8]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4b3k6j1euv-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Wed, 17 Dec 2025 19:39:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tjEYccvK+uLiuQKZvWDROZPY3z++v+R+uq7SFrSn1q5pPIJN1sIVJo65P4wpQSrkbYQfnpXntON5R5rZXms3Heh5bg4ZupZ//6piWpg0lAUJZVStHwL+LB4YUX8AUjuE0lTtPiyBp8CsV4wO6o9QEEn9lBoAU10bjoFvOeqFVvPAZR+B5iKGC9xnNLDzwMhv+8bOmNtlapcY4nXF5tFyFhQXv+Pjk1voikmkusF9oFue+m984Qo2nnqLXui2zNU3g8ojhOpFomQOkD5JERDhAQimrg29eXBIOLXoOa3pfP+XYCJBKJYLGMU1thbOMmLRMF78dhtSANSc+zmwdbWVwQ== 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=bYWl1chsQS5rOzoL6oM3/twY3yhaBlozK0swXdyqdIQ=; b=jTFIdBNF/kNNwPi2JMfoYPmdS8/HpmtZQEvAC5Tm3blhNKtvB3e5ZDPzlkRh5gTSXb769C/rVTjpcwqJR0K5p04OmXPhROxUF6SyctRZDNeRZaWG0kMJi9MODxFpgqQsqJy02c/QdDZ7d7eVdyZNNFts6XJARRfLDmeVL0KoQDxVDTWIJSmKRG78VY4NM1ya1cvS/qpXttk+MxfWJRMxKMKRa8KDh+3EcrOKLa+j4n3U2S+O/7MzYvuC/i0O4Q7vhSBySfA8H97qs7x1RqbVG7w7wZDZ0GxapGoxZdocMGswrqE5pVu53p853lvMJ2nwvyvrdMsls/stE7jXzAN0Cw== 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 MW3PR11MB4652.namprd11.prod.outlook.com (2603:10b6:303:5a::21) 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 03:39:01 +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 03:39:01 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] kea: add volatile files to create runtime directory Date: Thu, 18 Dec 2025 11:38:44 +0800 Message-Id: <20251218033846.107161-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 X-ClientProxiedBy: TYCP286CA0219.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|MW3PR11MB4652:EE_ X-MS-Office365-Filtering-Correlation-Id: cb1e4e4e-c16a-4b7e-fb7e-08de3de6fbe1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: YjhSRYFpYUGtJkyaKWJqDT0pecnWEKxDUu+b1//h+xNUEgAqUbFq8Xb0ouexk1cy60f3nifyvTu/gO3rhpUTzvWQJJW+eoERU7lDZ38YtNy62Hs7G6cVKo8DlhBY/ccJ0gnR/PkSWmBSpnlvF4RByF8bjFvDj72TpuPF11DAkPwGd9Ug9bz1vo6CBlek8jNy2snD2pqK7oSTyRBlgKXBHi4W9ksyGtZx9QV9H8RxN4PVPXB9JQ5JvUclwl56dkwIZPsHQHtkGmVX1IsnaUwL7q0u42FAClJ8QbdYgasbXCUOZlVS0NpB9qtO+xuWy8qIWnqHVHUrGvIvG9sJcrfswTtZtTGp7zCctWBKK3PBu0qCIs/C0xsnBqnhRuDNADV2XU77v9iSTGVJB7C14xC1Xk8EdFnlsgyu2KRkKfBWKeZ9ccWtxNmbatD/tQJClDGZAZu53JadF0iQIEfnhU37pr75/hVJ7htWdp/W8KMchhPwk6BSdiMRMgoSfRO+lCAmun7BM5R46xOC/jhve3Jc8j8W+pvoB2XlVte8TxudxD5eOjvcdLWsK/zWfJrRY4GG6iaLVWarOfJG50wLjc/yc6j3kv1ReApfFzquI+cJZXTrmCV5lvyYCUGRt6v74fbC9GvqlwpzFfHeebM1D7kUlgwrk9ublof2xUAid31pHZl1N2W/Y5ywmGNn1/3M6oOpEi9pvDFNKQ0FkLbKH5C7xLiBEvSSiFXgDqL5AkSGKmsjkAYtBKhVifD7noY6+9GqUd7bdeJzg/fHgIzd6u9ncDiT61YVWj7AAp+vE6hb6b2C1idIH4af1Su2h58HAWU/KQH24ueAvrA6vw9EMqUOy11jjrfQYXyyife7B1M9iIRVWaUtTW1ma76KQ3WpUPvs/51yUxqw1EhRAwtIH/3jPLT9DudS2zFeEQEflHeW9/a09e2fniARWnA/YKIxdF0KngeVxoEOC4MeoUCzby9yySJNh5t246Kb6DhcR1xzoSRSgzkmzbBiiuToESzGnseozUB+QmhVXxpsf8rQCWQbFgR361CKG0HsI/IG06D1zQEwS9/6sOuNoBoRfEbQbwb+fGLxgXE+RQ4pLJEwetIo0/PXV5bpcvhcC7h3WboRF1Qc99DfpBdkMwhARqCbtB9bwjJyjEnuOmD2jQqD2RtHWQ8UJZeLFgu0jKVIVg8JOw/DTY/BEbtwyfZGS7AKhe58TWw5U8oyJcT4fPUiEY35F285QMHhlcm2PZAT2FlBJmz7pMnUFXlD8eKwwkcEN3MWlrhjGEY3Nrxdk9PqJoL89YoEZVGCGADwMcHQajTiaSOxCcDYckaaaOuufGmv9iakO/SY33nNj1bK3jx9ryyzTQ/Mth5bOmYP+OIFmvLzlSC84aqDdfwcixQr2BExZnNwFLZyld5tmOao1/27Ij9WLLxodoF+o//WDPQHcySSxvsRcWKnR7TqEDWRIu1LfEgCelvKoW7aXoPHZOlEiF/Z4e66kYZZKicdup1esJraxwLwMxD7ukiC4iguL5XWRzzz 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)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Mmqtudz4Wfp0TI5w5xrCmGINKKyduIRMsRetmB/McAgWn02D+uoeZo0SVIwqjK4bbXsvStLqOqSdPUKeGLg9HtWbufNJfHYVKG/ZhnM1YAvkKxSjV1Y2TJtvQWGDbHHyUOTlH5OG4McEdmaauSUHmhadrmQrTaI626q/UnlvmvnfBxd4bCXDtMCBe/cESM1LvF0FHTIB4r372zYKGzjfwD6TIFkdKr0/HX3WMIcfTfdcoBDpynlo6EeSEwfFaJc/Q5uEnvPyn5Fyt0mZsvgNbyvJ3hgxuW440ZekkPPUq+uecQASJIke0U6xRFLxRz+s3nTaAeoI+/CQX1wDW+rV2/OiMUj87SyTU0XQdCeZDBrMvUCCZA80jEMGAzpM5Y6fdx8zGVsoZc0x18icv7mcToSvQ9PuSnzibQ6Nciv9VdnLX9f1FyVkru6NRwEhhWTLvBRWdrUSSG8D71AaGESAeWZHQuCBenk9FRSoHcQa8/vNi8oGfVB/FhMVUuBxNXn0mjlBmyjgzm3h/8A0rNHAq0fwrLPbvn1MDcYZ6cUbCVjWdTb47clJGClLRVwt6tB8VeQo+xmvXvrjIKmVsHME/1uazid5y6TmFRL/aKW8V5qasp4QfJT7bOBBJx35d22vEzIBWgVpVoM8gk5cgqRvb2vLfy/j7cuAV5jt2CulR1t0bxt4VPJqutWlze7DDAAuJPakKZNvRL2hOI71nnEE5kL3wf4VEafB5zujVyxexWYQCy7pIvd7NMRcD79aug0n2XKUzfYGf04n6qhZTyA5gNnMYSwxaxAYGv5P9sgv77tymwuI5c4iefizSTg4bUYZ/8ICkNkmyKS+ShU5purezaKaNcPEZPrkOD+Ztcs9rrFIyGJju5S0OOJWuQQngNBydGeCnIVPq8JZVpL/HFIvVY/T3OUTHqALjfawnG9+cs0JPz59WEdrr5Ufyu45pynU3vL58KghFxaXPxpgmkSe+gbxXh5EuLnOojsAWCfJgQ+GE4t7abMPHle75zKd2NjbQ7/qEwbU3ixNMOKuOuCmtnnnN51/RZ+G8z8ixJ5vKBKwpo/5m8EC6fITISBPAr1jlCa1I/GCnCB4AwWLa3zsNagAS3AKZjBzWHvKLGVr+tInQDBMf42d7SZsXHuqgbNmoPOvIufn0LRFTMwpXQGBJ8xjTPLadzp1lLy+MV3EPvc9absCnmCV5umDe6oIO2MoCTZYzOdD5WgtMyQW9RyLfWb8s5sy1Rs4kU5EQ65gmt+Z2GmPPthorbox6MuKZGHNgevcsrocYBm+eoD9+KcfRx2JK7tE5JhbKEejUV4K8KJbfwllk7MO7RZww5lZChP+vsOc3Q01JngfpxTXI0mkYAkC1Kp4FoC7293Qx8OONqAOgq4gMDFl+nSjIXBbeFcJo2Tzrh8p35n4KIVBIiwbAh+bQY1i427JE4TdYHHkOKFp1dmMjJj1ead+3jk6v5vauEKgMnPUk3LjNDhxvTfyx/g8dMw1QkAnLzmKTP7sZirqHn+LI1ydgkmOI0ZSy+l8+ewhZm9k86JyHHwv1g8u//Llu6UwPDV4bbABpzvkwv5X+KgpP2QsOJIceyEu/3ts X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb1e4e4e-c16a-4b7e-fb7e-08de3de6fbe1 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2025 03:39:01.2343 (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: FPfbVPkC5lOu9NoRVjNGCZm9uaRY/Dsg3fBDolH+U4D8nkBlZhW/gcgFobbUMiyn3swOwLH5WQ278U2wnGgauw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4652 X-Authority-Analysis: v=2.4 cv=ErvfbCcA c=1 sm=1 tr=0 ts=69437757 cx=c_pps a=5ppPJOB7bB2hO4guNQQ//Q==: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=t7CeM3EgAAAA:8 a=3nJuH_zVIihW8nez1bgA:9 a=pJAmF1FKerIFfj4g:21 a=nwb-CePKZZm3gL-ai9HY:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: pEopzMr4dIX4d0sFTXh2_20BFW7pFNCX X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE4MDAyOCBTYWx0ZWRfXxNe4MCftOa6X n3OpBX3hfl6+nnDiXq5V0nwU9WPIJhfwUK14XrJFLPGQmspua6uw3rCDQp3KkK8QF2z847A3265 n1B2Ku/ZOsiIybyPQuHgvwDdp1Evsb6SNbJ3Cw+wVWmUNm6xrvVB86yBKCHKBsdCT3exqMW5CRH H9SHI2o2/FkVyIL9C2zxMSZkiNkDGNnzh0b4pjMpnhYHCLmYlPgSWOGsfdE56aClIArB9OS11Mu E1PhLnHKIC6/l7vV0rWpJE4lZUqzyqKr9aiU4e7YC9ApWc0MYB+gENiTBK8eP7Z1PNSVhyvvjZC fJQdPsRE+xKNnwTGoBrD3FdFxlzljQCnUj+6gMIOtGfFAMSi2GhE2v6ZhfAF2u97sZIZlU+0syO XFe8lhl2i0KchMtUWCP9RQcccQFCVQ== X-Proofpoint-ORIG-GUID: pEopzMr4dIX4d0sFTXh2_20BFW7pFNCX 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_01,2025-12-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 clxscore=1015 bulkscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 malwarescore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512180028 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 03:39:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228085 Use volatile files to create runtime directories, instead of creating them in systemd unit/initscript files. Signed-off-by: Yi Zhao --- .../kea/files/kea-dhcp-ddns.service | 2 - .../kea/files/kea-dhcp4.service | 3 -- .../kea/files/kea-dhcp6.service | 3 -- .../kea/files/kea.tmpfiles | 2 + .../kea/files/kea.volatiles | 2 + meta/recipes-connectivity/kea/kea_3.0.1.bb | 43 +++++++++++++------ 6 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 meta/recipes-connectivity/kea/files/kea.tmpfiles create mode 100644 meta/recipes-connectivity/kea/files/kea.volatiles diff --git a/meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service b/meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service index aec6446f0e..fe09ef6437 100644 --- a/meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service +++ b/meta/recipes-connectivity/kea/files/kea-dhcp-ddns.service @@ -5,8 +5,6 @@ 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/ 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..a48a230654 100644 --- a/meta/recipes-connectivity/kea/files/kea-dhcp4.service +++ b/meta/recipes-connectivity/kea/files/kea-dhcp4.service @@ -5,9 +5,6 @@ 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 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..a441df9ad2 100644 --- a/meta/recipes-connectivity/kea/files/kea-dhcp6.service +++ b/meta/recipes-connectivity/kea/files/kea-dhcp6.service @@ -5,9 +5,6 @@ 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 ExecStart=@SBINDIR@/kea-dhcp6 -c @SYSCONFDIR@/kea/kea-dhcp6.conf [Install] diff --git a/meta/recipes-connectivity/kea/files/kea.tmpfiles b/meta/recipes-connectivity/kea/files/kea.tmpfiles new file mode 100644 index 0000000000..5da74be3a6 --- /dev/null +++ b/meta/recipes-connectivity/kea/files/kea.tmpfiles @@ -0,0 +1,2 @@ +d /run/kea 0750 root root - +d /var/lib/kea 0644 root root - 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 8729b1162e..5c46498d5b 100644 --- a/meta/recipes-connectivity/kea/kea_3.0.1.bb +++ b/meta/recipes-connectivity/kea/kea_3.0.1.bb @@ -14,6 +14,8 @@ 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://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 \ @@ -61,26 +63,41 @@ 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 -d ${D}${sysconfdir}/tmpfiles.d + + install -m 0644 ${UNPACKDIR}/kea-dhcp*service ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/kea.tmpfiles ${D}/${sysconfdir}/tmpfiles.d/kea.conf + + 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} } -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 03:38:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 76867 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 624FFD68BDA for ; Thu, 18 Dec 2025 03:39:11 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.33181.1766029144698921899 for ; Wed, 17 Dec 2025 19:39:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=cIToYseN; 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.166.238, mailfrom: prvs=44473d6ac5=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BI1Gv1U3177379 for ; Wed, 17 Dec 2025 19:39:04 -0800 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=KAlTsW0JMpR0rGYb5VHtSoRF3EJ3TNeAiolRAcSsQqE=; b=cIToYseNKDdU KZRklVjz+41BtJRhBTk4nYazeCG3CHXF03zWhv5W60AjQIX55dFvydHKRDqQtfcw yKEB2F8H6KAMALKQ5ZUNoMy/tNvKfSNX1OxIw+YGFHjBRQShfgt+YQUHtI0tLgwA 9FSKfrMBw707Irnfr+KpyfQVgcWyF7EaZf493iCIqVHHEHSmAhKlen8fE39UnuVS SqWrbeGS3sNaRbDfnCOEQO+THM4bRxRmBSt7WyrFqc68wXic/mzGvfjPVBAGk0Xv xN24EgF0ek6cpHdQ7Lmj0w8PPT1JA4Ke0kF2OUOJHAHJpEYPHbsAC3leLm/xWBDB TPNfb22U2Q== Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazon11012008.outbound.protection.outlook.com [40.93.195.8]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4b3k6j1euv-2 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Wed, 17 Dec 2025 19:39:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NfYANIuRtjBo3k4aqfmvLkIDbejgv1o+l3sMhRT0cCBgMFgWInScHJ56xLh2Qif+kAsTETAWnM7WFQswci2pJcMmp3XhlkEHSBOAngrgm9jr9J5VpVNXMR0YeVvYxCNw+U/a5SffrdJMzgVPMnulA3GvuO5coI7yHTOmNdtYbtMzL9XIHSLEd4zo9aV0a0HAIawj7hF+9J4iS8pBSqOcuCohx3sgKn+Kw4zjA4j7282FCvoifven6JE/rj5naFAntcmFwvji4Y0yRdxmjyG/95sAv3h57tp8Djlkj3Zo0slhzpLm1HQVULp2K7HomHjufi/7tEIPwtLqq8GTkUwBNQ== 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=KAlTsW0JMpR0rGYb5VHtSoRF3EJ3TNeAiolRAcSsQqE=; b=jO1lL7Nt5GAuvloYUEtnfyJNQJi8oej4jPido/JgscS/wSWwGxaDpr4OeKKhI+rBBp/386KPX/TLCmQet/ZiJxeC5KLgHg5djHFymY1w8GHCbRNaIobnt2LuY2fYBNiNZ9rvaoEJbnoYIZe1aJ45BUYF93CXw0vqSH52+QmlwfF0xH3q2OlEHVPzIlQ3SGQTq8pTBClmmGg3cIagBML2I8A36Slc9DsvY4iEN9m3eIq0hNrjdPDv+kjxYJZrGgK+xDaGFyvEACPYH0lIfmtjyCp3diYNchNJjqxT8/dXHKVaZCWRGouSLwPZlWsnn+GZL6wt7PqGoDb1qnYi+ZDSGA== 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 MW3PR11MB4652.namprd11.prod.outlook.com (2603:10b6:303:5a::21) 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 03:39:02 +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 03:39:02 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] kea: replace keactrl with kea daemons in initscripts Date: Thu, 18 Dec 2025 11:38:45 +0800 Message-Id: <20251218033846.107161-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251218033846.107161-1-yi.zhao@windriver.com> References: <20251218033846.107161-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCP286CA0219.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|MW3PR11MB4652:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a1a363b-1561-40a4-3a66-08de3de6fc89 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: 9qvv5NFIPTU86XS3iyq7ufgIl+h8X62GoqByhH70mUc2jWKC5+wfZ/5SGWBArvcd0wjwYy2VR+/IHhJs2icTaRWJMmYvIAlIRNJXj1hROG8KEjnuDOGHzb/ToyasdPwmuwNQfcxBIYJlpqN96jVVC9UKfs6UvjCNLsBOn8MkMah9xim5a1gop4M59EcEat4jq6R+wBQyF0lM7YUIAO1mIy5aci70f3acC1xeDiy07F2rrze7usb8OCSEKKVuE0FYuAzM7s5xeLo+/dCxTBlLazlq1nqdsjvQ4CXwasUUMzY/+ROctImMT6DFvzk8TAw4U2nDIFsD47+8v6BXTQWi/IjogbRAj2y+0NSOAyV9As2eB6hk3ubOYJTJBAJ4JqlPw/7l9AnN2JhK571MfXbdcsfKlCPkZmW4ze8Rt/BO1osacqLPJo6nbQJdG2RGZJTEhPGEb5AIw811fbHGEVXYojPhW9T+jwYWJj3lZJpvdhBhTzKsPjLDTlt7N/wm8V2MXI6QS24P5hd1i4GuKbcnb8x9NQKakXE9o2bKXsq+xHsyQG7okEqs0KXwjYjUpy8Plp0IOG3xCl3cABqf/lJL2wZu+IAigJKnVZgVAjve/tqoWqevBLhw6gGrPwaFyrqkK10Ec5muPVTw4JYdp0YPFlcyEMvIgRU/3K02AbZrmWjJqiTHC/68LNF1Ax411IN+UIhgl+UoFDJt0oafqW8vjC+9a2EF0u82uruECZUmfEwRsPwO2k/5dPmQYFVz3hubNc2Hcv8JBzsw0Ulk4Q5eiqvWoHCaPacS39ccLCg5xMcGO9sjVDYo9zXuLXI0QNonHyko3rSE0lIUPvxS0BO2oWqJhkoHRwPbUytdCllLgIi2zB8F4I0eTaos9Hg4+oovBnBIr5+aUUECDFhZrdTSLCRW7lqeK4sg1EaAz6nl8nS5EvAjDwGoQS16aoofFIpbMDmsm24DUuTwZ7apTv5hN5QYGMzCgbW5t17oWEGmFWTSh/Al4ECwbvbOJtrEPoogfK9NB2blkbCjfqwfPprSnLp9Y4v/wrDpC4rBar4vHPaZr/H6AVs/QmK19wJZh6Xh4pBCtLEtOU+WDwRv1n+QIIOesS+kK29A+4rzMuTq1iR9p8M3gFsbIyGAnie3UNB7JKsVsSgEVhqqKgrxzs8fabFC/Sn/CaOxX+7uHrZ1BQhTI6S9Cx93aLZL1ZfSgHXQN8fX+aO7IhtE8CV1Q3zovu5HazMqneICbMT5lMaWaFayiXv6v3dUZ/rckd3q6jLi86aEyaf8qsu82Qqq90elXPZd309l9QqKTsnZcTG7qXtTYmuJmjkjQpIHOtTBEiPeKhD78F345w1MulDV+23esQAVjpiOhGdRxqTbuLb0tYPS3KZMW1F/IKjhpe9PvrykAK/EYGrtFtanCzWJAsZdMMHhG8RHv8mlzSuJxk9Db/pAUG3P1UTc4ODx1tLGofuwuHVuiTKy7NOiH0S30sOHuA== 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)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nWeUNE0W9QPN9BMy6fDmqldikFaEuVGTpuAtiPOK/8ZUTZn32b5Xm9QzK4N+H0PRxY973aa1g6jFUacmw5+MVUM0o91zcs6GRS5MBY5VbiaLgKNOkNvpC3y3NWBUqvZmyicXsjThgPdZ0l11S2q/XLnwND8WfJMxnle2MsE9hcUFrH3XrElTqn/vjy3waety9i0IN9dqwYYGeRIvP977nKURmK1pEPcWbfns4L4EorPZ3GJf5hxjnD4TZK62HDnfSChYGOSQDp8q66hrveZLIhdhM0eEYfwbkD741aOKjKNLX17OEhV9g4b/tujL8NwdlR/URO//y+4PpdrBpYgD0SU2y1cR2wOvJjB6Yr0GgY4ZCfXuw4ZWwvM4yV9ydi0aPoaqX/WVHwkdnF3L8b2OkkMnLzCvGMki0hOWhr24ckNpiMirF6ThYqEhIVloUWuJGJWCCpZsIf90SCkQR5d2dul7SrQXNjbQRCw2QWYGc9WpCIJRCP+U1LHQYTXiQ69mnk6UqzbWyyUvS/obn8UQrCGal+rQztt89vGkKUYUcAp2wh3z/arp9iC2mIZY89nh41IcTfWH1UwWe+JFbb4O7lgpLksfbxEil5KMUik1vp0fGJ5Ou05nUfH5WdqJ4/2VI6feUlb/FOvdBc5WwC6Yrjq4XTWWBaRpmtjeY32Pp2NLaV8Qsn8r9tb4tpR8K0VbxlgEU6Xxhisg7mdNXMgrVjHODZwLjvy7AZUloQUo4tv2T3alSEYRN+tpsyrEQM/OosZwECRRx/w5IJzVxtU+rFrELZnj1jxWgyZmgRMrkJWGDjfg8TQkON0au+hQt29lgBr0ZCjHGLAi5UolHf7IU4jd5ZkVIwRlah4uG2VmyRFn+IDX5oixivrsFHxhkc1FXGwwFrAPaCMP6JnWmajGg0SqCFbDUm4IA4nsC/a26Qqssm8uFNEQITpFc8iMDrgZ145os4dP7LxxeRP1ug6me+x7weST9N/gOWBKrayPncTNSo+k1yIlXz0zJWl2efY+o3YHgt/IK/80dNqhxG6g63TPQZgynfmPPnEAx+iTmj3LQzsjp5QTbmQ21X51/omxSKqinFW0ODrD2aG+viTL3mP3OFD1Ps8D6kC5bm05hmFv8bLu/gIZnofE53sMa1HYoZPhN9utghhH7vUR6j26HQokEAuB+rsGyTAcL3ceqx/Jq8KpHAu+RN3GnYr2cwjYdSyfY389oPGSxVo7ispTpQ875X5ILWMPb7JgfjptTCeTbkcxnmzbeFNxgscvR9PScJI8cmcFrSbeZ3iwkpEFu4+jkDwsoRjyUCQrP5qIoNsagoC4MF8tUrcVymB01tqRJfFncSDr9MQ88t+HD88GSM55EgJe+jMEdTCemI1CGUceuSEpqXtTsmkL5UbhV7n/mXu/OpgvM2XCMic5qxAGHwSg98LrWKXkO1Nxwug20PJzt48qa7ZBDyU3YvKFQNgIRtvbB9Mr5LKa+ssMxsSG9kM1N8UAP01wCsfu5bXU/XcYldMkfuetVv1V/wYD5itqjWl7pYRuYYTXUhSXIavLk1eVAyseb78iU0AkQHN/Tejn13OYgM/S2NleeTo79vUe X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a1a363b-1561-40a4-3a66-08de3de6fc89 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2025 03:39:02.3256 (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: ku+uH2NzzXxRB9FePEQgvQWZhztxdIZ4k6tkg/gqwc6TZEyAAncefvh/QR6060sk+OMz6TcDFIzD5evX7PVK8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4652 X-Authority-Analysis: v=2.4 cv=ErvfbCcA c=1 sm=1 tr=0 ts=69437758 cx=c_pps a=5ppPJOB7bB2hO4guNQQ//Q==: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=3om1XbOCNqA7WYwrdzcA:9 a=Hti1SrPgC-EA:10 a=nwb-CePKZZm3gL-ai9HY:22 a=a1s67YnXd6TbAZZNj1wK:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-GUID: EchXHmf_tTs4sH6wHRQT_e1vhaikBD1f X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE4MDAyOCBTYWx0ZWRfX13TTsjeNryeQ UQN63p9Y0rJ7oR8+kNXHW7Jw7C3FCXg789HTJohrX9eia9CN3n10sOfEMQ/CpPbVbIGTLT7KEqF tj8Ro0/3zMctR6gxoqXCdV6dch690bvjXnBZRyMwrMAwaDlCxpZGg9uATbUbh80aIV2uIfEmlVD tjGHmzrERRwRVS4o2nvmuk/GblUQM7sZxtnOO1sazEBgl8CvXs88h35oreKfWsY0c8EWHOFNVXu bTx30FPw0bT5dMS/WuOSwhryiW6O3AUSy8ysDl6IX9R+wW84KipcQ9GHmoqt6K5cBnKxnwodMwJ 0ggj8LOt1v/exxmbAhdChq8XVOPKqt9rerHyXSaZ8qfrPbLEG3wr0lguBOh8dF5UXLxJw4eBMM3 MJYnglqccI35M1BTccYIiqHE/+j5nA== X-Proofpoint-ORIG-GUID: EchXHmf_tTs4sH6wHRQT_e1vhaikBD1f 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_01,2025-12-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 clxscore=1015 bulkscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 malwarescore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512180028 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 03:39:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228086 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. [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 ++++++++++------ 3 files changed, 30 insertions(+), 18 deletions(-) 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 From patchwork Thu Dec 18 03:38:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 76869 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 5C32DD68BD8 for ; Thu, 18 Dec 2025 03:39:11 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.33367.1766029145431863898 for ; Wed, 17 Dec 2025 19:39:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=s6VMry/l; 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.166.238, mailfrom: prvs=44473d6ac5=yi.zhao@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 5BI1Gv1V3177379 for ; Wed, 17 Dec 2025 19:39:05 -0800 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=/U8XME6j6FfDzEsvMTa7t3VOTTkaia5q62XycmVIlVw=; b=s6VMry/lDr/+ cPgXuSK6DghycfV76KzklLNYLorvzuYJlQV0s4GElrSmh/Eh9RIP5bGURIIhgHdF 1Wcz8L87+S8CL9GnZdKqx8GYcKwvc3GFVLLQNyIffq9eXNA5Jw3x62Jog0nLRZWW lc6iK03rC3J0yUpBkwwt8OhQrI6/2fpdCQ/wzFexpqz1W/2Zy58aeH27/2r7y5kx SMfXbWWg39IV70SebIkkXZZObYukV8iSm55iRSR+hpIV7jV4tfvixsHk7rNEYQDz LaH2O4U0YXKY8P8rQtVgNaaomXFej6RAxfxZJF/MbBnvvNUXrrmqjbaXJwoHoqVz qvDIDyQpww== Received: from sn4pr2101cu001.outbound.protection.outlook.com (mail-southcentralusazon11012008.outbound.protection.outlook.com [40.93.195.8]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4b3k6j1euv-3 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Wed, 17 Dec 2025 19:39:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CFvF22XiODrOPqNOf7SMcn4BMGBeZDWXtSNrqEXlomCcPBEQrQHpAPZ4mNLr5XH3NYu1K8iTCdV4rNXnqg+DElw3t8830Wru/okaX9xAvI6ZZ9emBQo50nXsbeOksbGBG/eQWPK0Pw4UR6EFIq6euMsB8a5oucxFspji1pLdcr6hu1mpiSXfPGxfjbr3euvj2zxCxaQs5vCP2Q531yAsxsXSPvwFPpTj2bAefpnqCV7aVzT6WJcXCgR9ap27ZZuk3QilV6tySEid1Kihi88P/vY04mg7VPe2zroDiBHi0T1iDYkQ070ul5caqI/I1cp8a4Xk8uS+BiA/orYMlwiktQ== 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=/U8XME6j6FfDzEsvMTa7t3VOTTkaia5q62XycmVIlVw=; b=K8kGMKrZhKaklAongkgNNeKXjR6+7EIWwnmsJzqy0NscQuTWEN4hytEWRzS56Wr1lSlpyMHpiyW3wezdckqWns7Xgtogdg/qBG0CD3k7pWpuf6DCCc/twccIj8s7yzVH6i/4yCNi5auJw/H9u5UvztNVRljM1ZDlCI12h/kfweNj/cocYRllRRNV728gd8kyvo4M4gfzEti1sQYsb5Gd/7J43EckOdzImYT9e94a9408rKCME2Z5GZS8IhbfqlZwr1T9j3sbj5pqzhj2eH/jA/XDg9+Wb5Iq0FYmd4nEIjN1gr+vnYLaExoGSCTBPyVrq9MXUePY822hVe8FzWPwtQ== 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 MW3PR11MB4652.namprd11.prod.outlook.com (2603:10b6:303:5a::21) 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 03:39:03 +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 03:39:03 +0000 From: Yi Zhao To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] kea: remove keactrl from package Date: Thu, 18 Dec 2025 11:38:46 +0800 Message-Id: <20251218033846.107161-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251218033846.107161-1-yi.zhao@windriver.com> References: <20251218033846.107161-1-yi.zhao@windriver.com> X-ClientProxiedBy: TYCP286CA0219.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c5::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_|MW3PR11MB4652:EE_ X-MS-Office365-Filtering-Correlation-Id: 3becef97-a836-468b-8b45-08de3de6fd30 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: Zw0SWOfkQrdHDwjziATuQPgGAmzgBhRrfdEBxGKUsgqGy4zHMGezu872hBTerJYZK9NHmyWEwFI993Ifo53E9gNJSbYoao0ijc3YGV1QowpuAcJ1Gqo86pGRwkEIn/3Vsv+nTiLLgiW//NyWK7IB8zFET2A5688BWEAcTZ03jYuUgy4Tll6HP0v2iYUkhGvajpUeJ5cpeNBeb4o6FFBD6Gge6k4H82FkGoQkSZna4SF2eopCrQsQ8t850IXZXLWRbny2P5Jz42ciLxFNpiP4RH7Qq1RLpXaVE2DIEIe3k8pXwkNyGkU5geEfrw5JH3FQ+qZAEm5k/PLwXH7QTmGfg99/oA5k+JOLLHg0+DGi8yHO6L75FZSYWSR2dd97eaFQUd0UJc1mXg2Edn9Vjvcw9Xkd2Z4ClXBFozmM2eJSriA4aXvA/beyZ1a//TsK6MLu0Zwi5G5TIrPRLwjpY9u+b15nFsFGA5RiGOJQzl8zsU5CKLKKvck2NxuRWhXuyofzbZSjCvFv+k+jQeSab/qL5/p6Q3MZg9YxWYwQoLTuSlTVKzfES7jhXcMnUdQ6eoarWbFqWGPlC8GMWbBAB0NYwkDVjzeXHLgS96hG1Wqd1Ypy8gxtULdKrm5G2p/GpPRjFR/hkFlTR59YSNU9t9lUtWo24vM1nEvx80KYjPxseGPClxahQfyexVP27uUQXOckKaXHRI5DE31wDLiVA4p60gbq6ZQzJe3y0VLETtEwE+lgzeKE8Jbku0mgCU3CICcgEvy08wSix9ziZjBHiAk6GxJ2tPImT1RyZGMG5j5vJfhnw477P85tov5YcspOFW9BLjMExLYIf4/N6UzOKvfFk+E9M8hYE3MRQb4WEWbEkykvq7Dw/76virY9yCqSv6S4a4IU5sjC3hfGcgkzO+ZEWOFtdmirpFj7IoPisN4TxuLry/yPkALcfN0BF7BsRgmlA0eJAueUI+Qx6Q1Hs+QcdmfRVzPcKJcu0TUusV74v4sqaLhqsaoxYuw52DH/H7ae+bJzct64FbhVh2fOh6nNGGEsbvR9qciP4jiMuSRuFeDS8p1Ws5HFJCcYacfaeVHKo1KeoIFBIhvXuRcpQf6D/jH9b/4RdWPxbgr3X+x+v8G8qMdipQTTDu6LDeLxAq1K0jjzARXjsaerWbeH/WSXKXpdghiJT6Wpsm+xMUD+22gx6MownTbn5OTIIg+02lh76kXSHjk564gnsZLC3K8aAudnsmjI+vki6EUGs+Lhgv09ihg/2fnwJZQAo9yg3uGcD3B7Dswgw66MW35irXPebUVdYOhzX+cjmQvuQPedE4PcUxbdg83ZkJ9cAk9kQbZwA0Xc9kdkC9wSTk3PQycc7ZQikpa/B0z61w15L8h8cHAdov6qnLmPFsmNTIotXDvlXp8TQfordWlhxl8jgh4zUIeIsy/9cB8D4BKyxfcZPpxMAzpXrMN8+RxtBsyhfcNR/wBwEeBWgayk4lQOCYE02Q== 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)(1800799024)(52116014)(376014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2g7oCx2eHLGZ8cSJldTFki7olE/kZCKpTb8SRrgj8ILC9vvV0smr7TOGzxJfFXAsPfwmo8V0nkXDgtljuu9FR4ZjvmoPq0zyzrRx6+eEZioc/zQB9np4vy23Yl0iE4BcoaJaoGSGENCWklSr52avBvPzIdZcsSujFLtuk7obUnPWswjYyi4tmN1W/nGcWrk3tFTF1jfW4MDVxL4j/4Ti6KRnE6JbY6kjs8JQGeOm4oNTzkVswasWdFwQvEfJRk9VKLeLqFp3RzfjJLeJ4IFVy9SDnrsu5mdszB+BHlR+os4OatU4prrpQcQ1kErdi9/RHYGjuk8kSwbz+LX7Tn/slOD0pJYRLGNvFVLdmSgfHdtUHVnBfRRtfGgrCPhooVSy5DZyJAHpymZ9EssOV53NWCvnTGjjaQ/fFOBMT6MWR96NrFvBpJyTPpr53vkDtI2GNb+RVvmr0x6BcBQl6HLh3fNEdDDDMSOQTUVDHDwbxbhTMGpqmTvX7IS7OtEUDLHNvU5Rbr2d2VDOpL1QKSC33e3iQVKK4g6EQjQfj/sPoiL3qxfXAS0P38ETVIVERlvSdVoNSIFuQoGw3rZTJwVeYs1BAPfiy70Eu8bjQ5Dz2Qu/Wit5ZrluUohGADQF/z8AnmA5QKlK+vFr5o5xD/wfpFiYVdcJto9YPSV10SAtwXiA4kC44TXpjrGZrmAzYBZMELho04kIgWZ9ZsmhWORqHb+PbTsFYT43Bz0in/Bd6qO5BIdTgZkhLRPNHZchNIifiOr7TeHWi2b0AE4RSN1diiKAmo1vqYUjBR55wKyXW7Mxm1y/wYqrhTMfO9lXWhmta5PnXVC21gk2kyvzcFqvWAw9dJ0fCCyrm9ziNPKa5xf9GLIrcAPGximLVGArCBhOQFsdH4A+9vbj9nJBeUruYwZMA81EgUSfdkVTGCE0BajhHp6V0sCcLgv8e5y888C+adQxWWNoe20B8yYwmxrsuhnHGxUTQqAxT8+FuMHAYGUykKZ8OpyY4aQkQg+lPvBCIyaWwLDca6qqjghKupp/qcUS3NyfGlTkOs5thCzBlFsYZaVE82jNI4Bf+MXjz/JNSZhxwrwTtTcWkQizwYX6+Vic2z3SUsQTOSQSqhqkXw10CbRg1CDpI6/mdz5ojYblrQ1DH/z9MUB67JCTDvgk/zy2QCuxXt0b2/M6P0mb9JAVnBMepkHFwi4Kx6H/1Qly1nqcp/qcB9haJ4uhyjrqQLqkxJ2E5I/0evx7n0VL/pcCrS1Fi/YSyBXp/ccECoJRst9WJbFs0vCCLab8/6qBVRbLwT2mP+hMX267KXgY0difzcRtH1YDGXCaN324IsFfwMglTsOTAWr8gRGyZIFP1yLBrt5AL3uAnkj5rD8ItXP05WOLTTF1j/6z/oL8nMtmXIUeCSuc9wPzQhcmSd7MuTe6CXDR2E7EByOsp6m+tFftBPTd35DMEeyC+/Ur5lhyFjlC0fnYlYv1bivGFTwPjC3tWFFHcIfLKPbgxKfWS2HsisqaOr1fgRLmFXZt0sBIzDPsBzcFAF3mUuC44cff0q0yPJXGLxkQeM4ULBPHotQvN9DaJtwMo9A3AkOS5bG2 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3becef97-a836-468b-8b45-08de3de6fd30 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB6399.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Dec 2025 03:39:03.4123 (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: 0TPqnGUO/ZtVQMkESm7QIbOo7vSRw+1fJM3N1zOJMyjMWKzt9zCM+XP95o08HHeWyC/ZLlVH+QA+4GoEzD7Ebw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4652 X-Authority-Analysis: v=2.4 cv=ErvfbCcA c=1 sm=1 tr=0 ts=69437758 cx=c_pps a=5ppPJOB7bB2hO4guNQQ//Q==: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-GUID: tjNBCPaZ_wPTrOjjZl2VWV3vnGXs1I0x X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjE4MDAyOCBTYWx0ZWRfX/q61cWIC2I6o V1fV105tjac9/HMXp1n/0vUQ48pJKtNOnTmK7HpDJlcnG8avqYPf3qYfQzcuOJNvs1P9uO+mjwo oD1eKpokk0UKWYyVi3B8Mi7SVRdLfSGLzQNHqpKj5OG8In9+fa4biIL5ExgYSxsgG9+WubNyAo8 VVfWcyRfg66ySDqw4rtoXNn6DH1tF4PrkrsUqAk4WN8qOJS9lN6T0O10LFLIjCARjNhKskusHUY zaldwuShHjSW16gEsUaIYcf3yqZrvgLmeyNVKBujkvwofwEPKI5mPY99IkVs17ZDeZpOuHZPhb9 3/JQ95QFRkrIP/QobRnIn/qHA4ZRBC6XRA62/zl6eqkoMY2YpLonYwNYF2gKAKMpbvOXY6K9n3x Qct2C87hyqqhHwkEBt8BFQHUkZgF3A== X-Proofpoint-ORIG-GUID: tjNBCPaZ_wPTrOjjZl2VWV3vnGXs1I0x 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_01,2025-12-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 priorityscore=1501 clxscore=1015 bulkscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 malwarescore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512180028 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 03:39:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/228087 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 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 \