From patchwork Thu Feb 1 13:07:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3336 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 01 Feb 2024 14:08:05 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-yb1-f183.google.com (mail-yb1-f183.google.com [209.85.219.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 411D83gX019008 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 1 Feb 2024 14:08:04 +0100 Received: by mail-yb1-f183.google.com with SMTP id 3f1490d57ef6-dc6b269b172sf2520015276.1 for ; Thu, 01 Feb 2024 05:08:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706792878; cv=pass; d=google.com; s=arc-20160816; b=zsUhVD2TKz1U349jRlGt2E7bC0f4WYCHF2FWAX60BUcKrwA13V+9o/1LGdBXwM3zI5 uaEPP/emRXVlT7uWFw/J2KT7NGpnukOFFWAWbFCMKuYPAzgt1iEaz97WlkWyE8cyZ7S+ qQj49UDaX3wjIpYOeBZ7QK48LSObvRhIZOlVRkv8lRVxCXV9P3WczEUg0yetXnfV10dd THyvF63N/9OVjZKOx4NngvNdQUJIukfSNzAX/mcKgaLTOH+z+jWqehUf7cqPM9zuy26I l+KHxpZqcpGmVL8VR3HWaiw8Bk3pT6Yok7ZnofbrSgSJ/sUgS1eFwpD1XX1FWwL5Z23m G5eg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=qac13A7Zy50cK1uTKGkOYUWqWYQvgeqnwpP+35yhL4U=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=kxrbzQZRfDyFsPYZJfzW+bmvbLPBq1JmK0phQf6oJQ9OHMcOCmjuZjn/kmO5bHasgb PS95rRb30ahWh73vGB0OzEa9M6c9mi5ar2TfUF8IiKEcHtIYL/ifpE3MfhvJUNF/fMrY 3lXNDViRJqQkh6CkpaKyw2ygKMqRTd8nm1UwdNduJbllmd7om3RardlzWLNjp20wOcrA 2gghdcBElHt9LRbj+2fgCYlwaVrtU5ixij+L+qSmIaO0XOZGNuhhyWG+gsFFfnt61m3e R5ecntGJiFGEmQBw9Qj8WgGRMr5L5a8H4cBBDmM7zYNFr+wIZulqH5xKDl5Tite6ZPsT Z0JQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CUyhuBvc; spf=pass (google.com: domain of fm-51332-202402011307559e90fc263a561c3b9c-fdfocc@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-202402011307559e90fc263a561c3b9c-fDFocc@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1706792878; x=1707397678; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=qac13A7Zy50cK1uTKGkOYUWqWYQvgeqnwpP+35yhL4U=; b=UgnnlQ5aCo8vRdGQc22xoeeFtAvBYtUG5QIwXgIDBEATasM23odMf+DmgxUSa+8FvA cJA014ZdFNKV42YBac2e4dUG+B0OXsNbJyomT7w3ua2uvjZ1p8I1i3F7gek38KWdFkKU NTqpJWLIwGwrbi5vt1bFwSJK2XjYkepChOYBso9oevlNyyTlu1D6GG434ZRriLodwoFZ +uFdoUSdcpqx7Oxp3Oc1hLv2X5SVW1fHdC9bfmCDOEDdjWaYZsAjlIMiLcS7teqs+ydn Gh5auJ/2jF3tmLYU3IZSXta3tFBJzdas8kxE0HgpogQAUXuz8zFRbPTkAkRySrKJmVHa zsMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706792878; x=1707397678; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qac13A7Zy50cK1uTKGkOYUWqWYQvgeqnwpP+35yhL4U=; b=m2YKqyYQDK6hb1liqAA+lNIBLDzL11QrXOFgzIphGQXWsqqDRhzQspfiYaQ5xWTnG6 siYrKzVEJ40xy1uRIHQXFWAKTuaeNJdbGs+SyFl1Oao7wT9F3hN9l6+bsnrG0s7XdbI8 RbdTX5+TiQeejSgVMLTI1iTtNOcGpeKor8WqBFrlUAyNQ+86Dd85qltDuMuBBTTgxS8X SgpkN3pHuIm6t/5KxqFLh53ptKK1kK5TB6xTf2u92+qFOQmjGq+GKbXidRfQhBkTSZBz sJEzlOOlt0nePzTuOFkeKIFFqVQrXdvU3n44V5uACzGuW+U+/ZU2i4U1Anw9PliOLlSm +vpg== X-Gm-Message-State: AOJu0YzB3dbtmNKomQy17DZ9PiHuaKtcFWaXYgjMXXZhyjrby8WuZ6v5 nxgEv1NtbYFY8i6n509elIwJkup74fmvYR7FZEoEdnLOELiyaTgD X-Google-Smtp-Source: AGHT+IGQm0lQiSN+9tzGdd9o1jqHsxpYlQX9BnBMKvGpVb8pa23+obZ87Vxcn0kWnPt7v4NApFkaSw== X-Received: by 2002:a25:9801:0:b0:dc3:fdb7:5bb with SMTP id a1-20020a259801000000b00dc3fdb705bbmr4901741ybo.7.1706792877893; Thu, 01 Feb 2024 05:07:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:d011:0:b0:dc2:1c63:41cd with SMTP id h17-20020a25d011000000b00dc21c6341cdls993860ybg.0.-pod-prod-00-us; Thu, 01 Feb 2024 05:07:57 -0800 (PST) X-Received: by 2002:a0d:dd8a:0:b0:604:63a:f7f with SMTP id g132-20020a0ddd8a000000b00604063a0f7fmr3265925ywe.4.1706792876815; Thu, 01 Feb 2024 05:07:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706792876; cv=none; d=google.com; s=arc-20160816; b=lrRbsVM0xr/hcxeO0PagQxAELFaxa6k7fe6A/hmeKV+Dl4dfP0+wyfqCkpbD6C7Fr+ CzkqSj0hPffc59+Z3PSn8NfYIBRdYIoNmC2pxy9S2ba0m92ijvp9tqcDNsnko9GbvkRw /qM1f8mXShiEYcnjiDTplA0KhzRWjAeNX/qSZdHHMHxYe3GzNPYEQ1gZULDRCZ6IAISf 8SRpYX3gXsUjRIfYBzZAS2sLEJs1RngXHEQSBSjp56OYJDaB7f8IyRT1J7O+rodjFMfK qzitHKltkOvnJ269dpn8M0djszqGEPNkSHArAMawlWZrZ4r9SwX44R6YffZnJMttYcKJ /xZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=5cBcA471Sdmw2o3uK12RfUYFaX9jVmGUZzeSVqGzYOo=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=OfPJYR6ztLQchDDtCXQ6d+hKlbk61iOEpniUx6nCHN7ZOQe9tbpMla1shYodXkkL5w lMoRoQ7lPjtk//AnGFebGu/PCQvY7QOzwRc4gQX8oc8HTJCiISugFJREZZnQI5PjXFXL zPeKEICCtigITsBs34l/ym+WI/OgA85qWVFwKBOSaMC9/HNEoEmRTuyqVPrmT+IysB0S fflIIO4MoiqJH+oXatjyW8uE8T4kDnKaKYDApPvmKTrU3lUZKLJyxbOXhDT46a2g1TBb IGaEf9bk/+g/dW6PBA0RY2fwJM6S/6wdGdfOlGE5qAqOSAVIb38sW3jE83/LG+CJ4ka8 IqIw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CUyhuBvc; spf=pass (google.com: domain of fm-51332-202402011307559e90fc263a561c3b9c-fdfocc@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-202402011307559e90fc263a561c3b9c-fDFocc@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id h72-20020a816c4b000000b006041a44d13bsi238680ywc.2.2024.02.01.05.07.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2024 05:07:56 -0800 (PST) Received-SPF: pass (google.com: domain of fm-51332-202402011307559e90fc263a561c3b9c-fdfocc@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202402011307559e90fc263a561c3b9c for ; Thu, 01 Feb 2024 14:07:55 +0100 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" From: Quirin Gylstorff To: isar-users@googlegroups.com Subject: [RFC PATCH 1/2] debianize: use dh_installsystemd to automatically add systemd service Date: Thu, 1 Feb 2024 14:07:41 +0100 Message-ID: <20240201130752.3734292-2-Quirin.Gylstorff@siemens.com> In-Reply-To: <20240201130752.3734292-1-Quirin.Gylstorff@siemens.com> References: <20240201130752.3734292-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CUyhuBvc; spf=pass (google.com: domain of fm-51332-202402011307559e90fc263a561c3b9c-fdfocc@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-51332-202402011307559e90fc263a561c3b9c-fDFocc@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Quirin Gylstorff Copy the file in `DEBIAN_SYSTEMD_SERVICE` to the folder if it has the same name as the debian package. This will use dh_installsystemd. Debian detects any of the following files in the debian folder they are installed into usr/lib/systemd/system/ in the package build directory: - package.mount - package.path - package@.path - package.service - package@.service - package.socket - package@.socket - package.target - package@.target - package.timer - package@.timer Signed-off-by: Quirin Gylstorff --- meta/classes/debianize.bbclass | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass index 7de98673..5015d52c 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -11,6 +11,7 @@ DEBIAN_DEPENDS ??= "" DEBIAN_CONFLICTS ??= "" DEBIAN_MULTI_ARCH ??= "no" DEBIAN_COMPAT ??= "10" +DEBIAN_SYSTEMD_SERVICE ??= "" DESCRIPTION ??= "must not be empty" MAINTAINER ??= "Unknown maintainer " @@ -116,12 +117,26 @@ deb_debianize() { # contains an entry with CHANGELOG_V deb_add_changelog + # copy service files to debian folder + # this will automatically enable the service + service_installed="" + if [ -n "${DEBIAN_SYSTEMD_SERVICE}" ]; then + service_name=$(echo ${DEBIAN_SYSTEMD_SERVICE} | awk -F. '{print $1}') + if [ "$service_name" = "${BPN}" ] && [ -f ${WORKDIR}/${DEBIAN_SYSTEMD_SERVICE} ]; then + install -v -m 644 ${WORKDIR}/${DEBIAN_SYSTEMD_SERVICE} ${S}/debian/ + fi + service_installed="true" + fi + # copy all hooks from WORKDIR into debian/, hooks are not generated for t in pre post do for a in inst rm do if [ -f ${WORKDIR}/${t}${a} ]; then + if [ "$service_installed" = "true" ]; then + bbwarn "systemd service '${BPN}.service' exists and is added automacially to the debian folder." + fi install -v -m 755 ${WORKDIR}/${t}${a} \ ${S}/debian/${t}${a} fi From patchwork Thu Feb 1 13:07:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quirin Gylstorff X-Patchwork-Id: 3337 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 01 Feb 2024 14:08:07 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f58.google.com (mail-pj1-f58.google.com [209.85.216.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 411D859V019018 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 1 Feb 2024 14:08:06 +0100 Received: by mail-pj1-f58.google.com with SMTP id 98e67ed59e1d1-290c967946dsf759933a91.1 for ; Thu, 01 Feb 2024 05:08:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706792880; cv=pass; d=google.com; s=arc-20160816; b=qA3tZPOUm1VdNMvayomIzWufyAXJkBOhhuJYaWXBIpRxLL5BLw/Cqcm2DlWXIUIkBF H+IQHaBRuMQBehb98zm16BflKAVkLADgfCfewRfC/oSrL8/P28lBEbjqeCT5TqOvYbnn K91XcPArCq+o/LyJBEG50Xp1eW47nbRPTwlJbJ9Sx65hDthXKrsBhRRiH4JIwgiA10TA iC8uXO7u88AS2F+03dyIMjlYHAWSF2jYPtxiNoTifLwjW6wJjmmDOEug7LKAtoydKhqV lXgSfbG70Ru43bkKpd+j6SDCMKLQmpW5Sdm1TZNuPcU1FHyniRnhV//A4/IQR9JY45HL hCVA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=NH0ENI+aLTxBiCQilsMLOF2AqoGW+jYiYHA/nk+s9zs=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=T49gmaxa59WksjqqAJ4UVu4G7rjhMDn4BEcFuboqlVrswkkB5t3sLugXa+YgOSdMji TzUL998JHI7nrH6d4/p9Q8+3ZRgjBljIv7cncAdRUeIXYKlzoPr8gYBOc+tSSInpcFF5 mkyDBPwnx2lLVbSukieRKZsEq+y+AJgnWjWZjFAscmI37KMm7e71uejrhMi6x2X14sva KBS2/+EK4gWKPloUP+aXUmc2wUDSrfrv0preJ+XBf0vCH6C73G0M+P1IZjvGk38t0TGm jH4k/Q6jMTeUOnSg4EfwjNXawocjUZmy31hiby8i4NWwHbazKtB5yHzJZyiPWol8TK7x lVEw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bWB+AIDN; spf=pass (google.com: domain of fm-51332-20240201130755f0d663fa4f07a03e99-ubkw5z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-51332-20240201130755f0d663fa4f07a03e99-UbKw5Z@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1706792880; x=1707397680; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=NH0ENI+aLTxBiCQilsMLOF2AqoGW+jYiYHA/nk+s9zs=; b=kTK6kqni8JwYiUEhfLeA2dMG/4+NYYMugooZrXqbKVzwS6r/DI1ctdF5RcNirr3nW8 1JPtWu1iHn+RdG/2c1GD4cMC/W6zfLORn4vDJSBfr2MdANXYtjs2lNQO/WgP5etfQBjj FG2BIs1EGC9/waHBPILIXWe8dhRdiX7giBsc2qy7p9knX5WJ4EwxVau+Dp/C8Sy5Wx+8 QmRW5VZ3jkqrZRP169hHem8kdC7kE+4wUhA8vomtUyHQEiQY+lWM3QsSja4ZodxQ2n5x /pS+RWzTtYIpgGpkQvbvyWs2uE25kRwA0iuq/C9kEj4Fz51fB7Nttohxs0/Xn5xOsANx 8/NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706792880; x=1707397680; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NH0ENI+aLTxBiCQilsMLOF2AqoGW+jYiYHA/nk+s9zs=; b=nDyyeDTLssz/7FIpwGzGApXkdNmJA6Kz2fV/kCyX5NLILR7XFeC8GFN1W7v+Q0A/fm t+P2YrwboX8DtKtfaBEj5r9CfsnBuqIKfps2ZiCgp3xu0IkfwTPO/67Ma1JbFtkn+lSC yrtjLWOibAhz3FFkc3xsu84afvQCco2F8WE7fhLRSRlN+u86bMfRUWsMFR8N5/hlgoLx VT1/2WXoTVG8TAeL/d70QF8vB30JCAY74J2Bt478qwxoxZZgOcEnCZT3xYmiAQzFzlNX 7EQIz8kWfStq1xHc8RMjoEvJewperNbBJ4/oeltY56ejVbbjmL5TfgZeq329d0gepRMF xBLQ== X-Gm-Message-State: AOJu0YxABjcBgaSdKjsIEbLzoLO+/jh/CliCcPKt+rKV6uAqjweQzWdj AY8Bgvu65Y2i9rrsBgMqkUzQYFmXQ05w1is6oPDmzkJfCNOwRaUI X-Google-Smtp-Source: AGHT+IGmtajpAGDWSlAFJkRyVHz0cnc5wz1WFZV6kor5oTpup4l0Xp9kkkT3mm5oyCMn1qWwvbxI6w== X-Received: by 2002:a17:90b:4b86:b0:296:2d5c:23db with SMTP id lr6-20020a17090b4b8600b002962d5c23dbmr174260pjb.11.1706792879749; Thu, 01 Feb 2024 05:07:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:2691:b0:294:b2ff:e4a with SMTP id pl17-20020a17090b269100b00294b2ff0e4als706393pjb.1.-pod-prod-05-us; Thu, 01 Feb 2024 05:07:57 -0800 (PST) X-Received: by 2002:a17:90a:7806:b0:294:b47d:9f4f with SMTP id w6-20020a17090a780600b00294b47d9f4fmr4635646pjk.34.1706792877546; Thu, 01 Feb 2024 05:07:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706792877; cv=none; d=google.com; s=arc-20160816; b=JFKTInyK9TtoPmlkgZk4sGERJln5vJsQO8n7YnOM/Dy4BcUgVLeWvbyzgMeWyxbuxU IOnC82jEDPWuPIBPr61Gix+1Bwo/tTE+15nNexio7BU271V8TuKCpn3bMKFKQ0QypcjO STEXfvKdlvLBsvhQOLrqA26hJPct+KZYtqtatr2hjjcTG80an4UwdpWCtS5YnI7ZWqdb c8CCfRqTpzmCzYtoBL7WzS509yknubN0uNRh0di5nQ9vNJKomNCnd/ACMds743BNWsYi UcUq88kXpUlte8Yi8UyoRBN2slpUujPxOJBflpSI5Aw6S49GzuxbaF1rvXpJcWIcoUCG msFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:to:from:dkim-signature; bh=b5NO+q4rtw7ppuP6KO1ayI+mRDWm7IQiFe1rbZLPDIg=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=Td34mAv88ZUadUckWOrNpBuu7TEZ+UvWH9ATb/fc4MoJB5TkXyEgfuWI9CzU/YccJG 01ATiwVjbn07HhSQ/fvOpybFJWsOdPG7F2Iwuy6+Ig2/I+QmXmf7BX2gWDpyy6MmFkEo srUysJYFjVPcKb82nPqtR9JciLxDOy8z/F9wyV2vyeauWzz9VC5YV64nlfaZw4yIa3at hj+ZGqg2TLzhZsoa8hIMU9Co/sb82f/FfDzhD72NH7I718UuYDFRroPqnMYKCkQsxHj8 46OqL5ovWM19a1skTRsPXBvX0RB7tS+i+r0/Ma18lAPeLPU8WfNIVgNhDT0IZvVbJauX wukg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bWB+AIDN; spf=pass (google.com: domain of fm-51332-20240201130755f0d663fa4f07a03e99-ubkw5z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-51332-20240201130755f0d663fa4f07a03e99-UbKw5Z@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id n9-20020a170902d2c900b001d6f295bc4esi605899plc.4.2024.02.01.05.07.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Feb 2024 05:07:57 -0800 (PST) Received-SPF: pass (google.com: domain of fm-51332-20240201130755f0d663fa4f07a03e99-ubkw5z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240201130755f0d663fa4f07a03e99 for ; Thu, 01 Feb 2024 14:07:55 +0100 X-Patchwork-Original-From: "'Quirin Gylstorff' via isar-users" From: Quirin Gylstorff To: isar-users@googlegroups.com Subject: [RFC PATCH 2/2] meta/recipe-support: Use DEBIAN_SYSTEMD_SERVICE variable Date: Thu, 1 Feb 2024 14:07:42 +0100 Message-ID: <20240201130752.3734292-3-Quirin.Gylstorff@siemens.com> In-Reply-To: <20240201130752.3734292-1-Quirin.Gylstorff@siemens.com> References: <20240201130752.3734292-1-Quirin.Gylstorff@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-Original-Sender: quirin.gylstorff@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bWB+AIDN; spf=pass (google.com: domain of fm-51332-20240201130755f0d663fa4f07a03e99-ubkw5z@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-51332-20240201130755f0d663fa4f07a03e99-UbKw5Z@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Quirin Gylstorff Reply-To: Quirin Gylstorff Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Quirin Gylstorff Change recipes to use the new DEBIAN_SYSTEMD_SERVICE variable. Also add comment to sshd-regen-keys to explain usage of the old mechanism. Signed-off-by: Quirin Gylstorff --- meta/recipes-support/enable-fsck/enable-fsck.bb | 6 ++---- meta/recipes-support/enable-fsck/files/postinst | 3 --- .../expand-on-first-boot/expand-on-first-boot_1.4.bb | 7 ++----- meta/recipes-support/expand-on-first-boot/files/postinst | 3 --- .../recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb | 1 + 5 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 meta/recipes-support/enable-fsck/files/postinst delete mode 100644 meta/recipes-support/expand-on-first-boot/files/postinst diff --git a/meta/recipes-support/enable-fsck/enable-fsck.bb b/meta/recipes-support/enable-fsck/enable-fsck.bb index 0413f79d..b68d8f76 100644 --- a/meta/recipes-support/enable-fsck/enable-fsck.bb +++ b/meta/recipes-support/enable-fsck/enable-fsck.bb @@ -10,16 +10,14 @@ inherit dpkg-raw DESCRIPTION = "This service enables fsck on first boot" DEBIAN_DEPENDS = "systemd, sed, mount, initramfs-tools" +DEBIAN_SYSTEMD_SERVICE = "enable-fsck.service" SRC_URI = " \ file://enable-fsck.service \ file://enable-fsck.sh \ - file://postinst" + " do_install() { - install -d -m 755 ${D}/lib/systemd/system - install -m 644 ${WORKDIR}/enable-fsck.service ${D}/lib/systemd/system/ - install -d -m 755 ${D}/usr/share/enable-fsck install -m 755 ${WORKDIR}/enable-fsck.sh ${D}/usr/share/enable-fsck/ } diff --git a/meta/recipes-support/enable-fsck/files/postinst b/meta/recipes-support/enable-fsck/files/postinst deleted file mode 100644 index 1c4c3bdb..00000000 --- a/meta/recipes-support/enable-fsck/files/postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -systemctl enable enable-fsck.service diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.4.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.4.bb index 0996000c..a24d1e9c 100644 --- a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.4.bb +++ b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.4.bb @@ -11,16 +11,13 @@ DESCRIPTION = "This service grows the last partition to the full medium during f MAINTAINER = "isar-users " DEBIAN_DEPENDS = "systemd, sed, grep, coreutils, mount, e2fsprogs, fdisk (>=2.29.2-3) | util-linux (<2.29.2-3), util-linux" +DEBIAN_SYSTEMD_SERVICE = "expand-on-first-boot.service" SRC_URI = " \ file://expand-on-first-boot.service \ file://expand-last-partition.sh \ - file://postinst" - + " do_install() { - install -d -m 755 ${D}/lib/systemd/system - install -m 644 ${WORKDIR}/expand-on-first-boot.service ${D}/lib/systemd/system/ - install -d -m 755 ${D}/usr/share/expand-on-first-boot install -m 755 ${WORKDIR}/expand-last-partition.sh ${D}/usr/share/expand-on-first-boot/ } diff --git a/meta/recipes-support/expand-on-first-boot/files/postinst b/meta/recipes-support/expand-on-first-boot/files/postinst deleted file mode 100644 index a190b01a..00000000 --- a/meta/recipes-support/expand-on-first-boot/files/postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -systemctl enable expand-on-first-boot.service diff --git a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb index 9ce1d8d8..b6d60814 100644 --- a/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb +++ b/meta/recipes-support/sshd-regen-keys/sshd-regen-keys_0.4.bb @@ -5,6 +5,7 @@ DESCRIPTION = "Systemd service to regenerate sshd keys" MAINTAINER = "isar-users " DEBIAN_DEPENDS = "openssh-server, systemd" +# postinst also removes exiting ssh keys SRC_URI = "file://postinst \ file://sshd-regen-keys.service"