From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7330619587858268160 X-Received: by 2002:a17:90a:6f61:b0:295:ade7:cdf2 with SMTP id d88-20020a17090a6f6100b00295ade7cdf2mr4980319pjk.13.1706792879842; 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-Google-Smtp-Source: AGHT+IFlp7BBtBm/QVtNljAZVAEFD7rS3d+ynVEqozGpunEJhe8sx7eFLkCSmGqlGu/xblKzMcSV 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 Return-Path: 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; 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 Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240201130755f0d663fa4f07a03e99 for ; Thu, 01 Feb 2024 14:07:55 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=Quirin.Gylstorff@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:References:In-Reply-To; bh=b5NO+q4rtw7ppuP6KO1ayI+mRDWm7IQiFe1rbZLPDIg=; b=bWB+AIDN1nqp5wxMivaV/6NxfaQi7htY4ZGG9M+kwYIcvwEfDSfqthxp0V0YDIQ3H+S+GP jddvOS3w5cYiuE4F1gZAWhUW2RGv6NW9wmQE6shqgkYVApCpJwVK/mh95ERCcl2X52GuonwW KgQHCNguHYv+kgcd1LBbWCWkl2rlM=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-51332:519-21489:flowmailer X-TUID: Ow3c7b+lYjO4 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" -- 2.43.0