From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 11 Nov 2024 22:00:57 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qk1-f190.google.com (mail-qk1-f190.google.com [209.85.222.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4ABL0uHx015368 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 11 Nov 2024 22:00:57 +0100 Received: by mail-qk1-f190.google.com with SMTP id af79cd13be357-7b17e90d16fsf631220485a.3 for ; Mon, 11 Nov 2024 13:00:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1731358851; cv=pass; d=google.com; s=arc-20240605; b=aelaVne1gjwoxcPtUMKH0yrxiaQc2T0Szh6PJNvtFLXj5N8cAhhK+NGw5iPQVfaKd/ 3A+c7mQIDxBuQqlAfVxdXseskuRk/rDBVskgydCHEKyu07EzGbZH0KWcrqU6ejvKoCWB lkCt+8A70RvnkOzmBZKy5HK8HlSuNVMN+NbDV/DecyJXPMG6AuxVTyGxUpGLC3dDfXuV /Eh+Gi+eNIzwNgMS7A44/o9D58Mr+I0i1G8lSEM1Jv0XhyD0mnNiMJr/ehV2AgrMBtnW gYXxts/61HGIpJENm4UAUVoDmRoZUln1phboQ3K1GX8qpVU8veI0Uu9TqtxLmhtnXdqe 3UFA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:cc:to:from :dkim-signature; bh=e0wEqeurvuMPIzthjMaWFKee7gx93kz3S16C+VpK0gw=; fh=YiSSpyNKY0PK4BvzQrF6eDfOUF8Q3MPmdmuUGtF9T3I=; b=SmtB82hcxXWBQs892IhHhiBa7WsO1EzLnWBRaKiGIxXMwBY2Chvscy3Y5EfWtL7VmT aIxGOpiihsFshGxaegzUXV73iYxSXTx8uExk+HBkTYYPu1g0Q4Fe44HrF4P6aus4shnW zxdDop8ywLqWE+nS3K1q5LGZyJ+Br/oxtLE3zo76r7pbW0Rn5LFc8aVkzJo4wAq/t8lT eXjGtyt0aBwUiVar/P+fg2mtGBFmj2PrjO52yHsdPahfbuHc4Afoxmb1vuX5ZrPHc4BE vQhnugH4PC6Ey1my7yQwHENsWtFmciiso0HskUuhr7sZ94V5RbJey/yl1cNxBqm/B8sH WJXg==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DKBmAkUA; spf=pass (google.com: domain of fm-294854-20241111205026cc787bd8742c941f8f-o9xhhp@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20241111205026cc787bd8742c941f8f-o9xhhP@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=1731358851; x=1731963651; darn=ilbers.de; 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:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=e0wEqeurvuMPIzthjMaWFKee7gx93kz3S16C+VpK0gw=; b=hOj0bJ6zvs7Xa7E/sCY2LtZWDxWM7QrIhdpPjzwiQQAfLwLdm+so6IPV/iA8TCNjuu yhFGbTlJpdczT2ktIRIdgrxrn0TyJel0n4zGFlQ5np76pDA3kYBgR2OTCKeRmtWNFTzK 8Z34hzpe1skf8Tk5k2oJib533luV2Gazloi0SlSfEEa2mxi1Ofmte7UlSDJXMSr2dGOC igIQ3bomMrBKDUobLEBELfc3tsEcD9VjB05W5juuK1TpvqGU14gJlwcC8OQvLXVsz4mG u3ugSPZiVNo08NhusUOYJba7eLtQPSjCM6YkDf5Al1T/aAYeT1O14roZYGnknxUqGOgc cIJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731358851; x=1731963651; 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:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=e0wEqeurvuMPIzthjMaWFKee7gx93kz3S16C+VpK0gw=; b=vZkCQFe1uboBmcICwEEC5AfRCkY1rgPF8iAlVATKle4A/f+JFiPRGyVIC4A6mag5nI EeFhCEaUXPIFMRyeVf8X+7/zD4ML7TgP5v9qQTBC3xAvpNF1WW0TE605XmZ7eHlA1fDr BHULUl7Fo1vfMoity5eKt8XOT30OfUHh7QqA2WdOiyQTfbRRZGsuB8CG8Z5ExQyUNs4F 6MttVIFjvXRhjx4do4QSsvdR+8x/bIueq6kghG+jYFiMgpw8IRLRioblmuL5VHcQKiUX CD1R2yKvvp8Tot1aig+T50hpe8BHykzQIFHqonliL4e+sAxcvUjuLyLe8dQfZ4aIhvCn 6KKw== X-Forwarded-Encrypted: i=2; AJvYcCWJgGEXM8X2NkcbQzfgH1w16t+LHd/dfUWfPvJxRh/jgfjqS/p2Mb5RIxfbLYRce3V4z/EI@ilbers.de X-Gm-Message-State: AOJu0YyrUVf8fRx3AS40cb35YN9MB7IXwFbC7GqJbXQw5qI2dm0pUbtI cDciLNWdANJxSiJuTdAvYinpNcK4ujNz6wUs9JwT1rkKvgSEcdJk X-Google-Smtp-Source: AGHT+IFNNfHRhXEVCe5Udz5BG/CuS6sHp6aMn1LnOCZz2t9pBHk0p2pJFi01SYennQns3br3T8izsQ== X-Received: by 2002:a92:50c:0:b0:3a6:f349:71e6 with SMTP id e9e14a558f8ab-3a6f3497316mr111638775ab.22.1731358229252; Mon, 11 Nov 2024 12:50:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1686:b0:3a4:f561:1c0a with SMTP id e9e14a558f8ab-3a6e815d01els35311665ab.1.-pod-prod-05-us; Mon, 11 Nov 2024 12:50:28 -0800 (PST) X-Received: by 2002:a05:6602:3fce:b0:82d:13ce:2956 with SMTP id ca18e2360f4ac-83e0335471emr1486758439f.10.1731358228285; Mon, 11 Nov 2024 12:50:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731358228; cv=none; d=google.com; s=arc-20240605; b=jbiLsIH6BnEurMoCM9LheNx0gTVRhP7pgYwtMc0EekL9cGzUFJ2ieIxAU8NNvz71z4 MLLcCBT0dD0dQUpODQ4vM3MkInS6GtcuR1zbcguMp65sxanYcQ/tbuTnBlrMJHdh4isC l91NQ+SqYC1AzFzkVpoFswgD8jXfRkH10zxqqWRfB7C4Lmm/6V3a6Eek7/N3aoZ3aa6Y f4BjzJJZ8kYRcqJ2bHGgZG8PtUbsjTfX/HqayduVepaROXkYl+S7EvkpaYW2S9gQJ3Zy tqAWiII116Pe93BCXQlMXvAlZQPHo2szSUlmsLTUBbdRjVv6NdU3ZoIhAoqJw5sOENPB Rz5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=nr/IOWZlvRHaDWujWo2iA6qbxs9uM0R3Tj5/JwgWteo=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=B65goY2qyNqcADQwBniCfoyhWoN5iFMTzg3CoYHAiOkpp3utg1HhO79T9NrlulOE9t jDjtAjmIOSxArjoaJRKtgsBYQtnDxRYt649/pxGuMmOVNtElq9OheK2GVpkGqML+IFlT XQnlK7Ii5OEqfRkHmzojai9gnKKizjUl2TpZfiBXTBvWun4G/tFe1cdSTC49T9KuWKnV DkKE7kYqHHS99k9gNkk6Q6MGzpkHlpj8ePoVi5FW+ZxBF2/6ixBgByONY15i+d3gApKd bvs0IjfCn0GeLrhKXlQ7xnmcxUmGQwaIzu0lUFpPUafuAXKNO+zAp559O6Ecuy8Q1dOU lbdg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DKBmAkUA; spf=pass (google.com: domain of fm-294854-20241111205026cc787bd8742c941f8f-o9xhhp@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20241111205026cc787bd8742c941f8f-o9xhhP@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 8926c6da1cb9f-4de788302d0si234551173.7.2024.11.11.12.50.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Nov 2024 12:50:28 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20241111205026cc787bd8742c941f8f-o9xhhp@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20241111205026cc787bd8742c941f8f for ; Mon, 11 Nov 2024 21:50:26 +0100 From: "'Jan Kiszka' via isar-users" To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 5/7] initramfs-fsck-ext4-hook: Convert to hook.inc and improve Date: Mon, 11 Nov 2024 21:50:22 +0100 Message-ID: <119732ece3ac710416516282f0cdcb5c05c9b4d1.1731358224.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DKBmAkUA; spf=pass (google.com: domain of fm-294854-20241111205026cc787bd8742c941f8f-o9xhhp@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20241111205026cc787bd8742c941f8f-o9xhhP@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Content-Type: text/plain; charset="UTF-8" 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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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-TUID: SaCv0FobkMDy From: Jan Kiszka Use the convention and helping features of the new initramfs hook.inc to simplify this hook. We move it under recipes-initramfs to align with other recipes there. Another change is making fsck.ext4 mandatory, both as dependency and while copying it in via the helper - there is no reason for this recipe to almost silently ignore any unavailability. Signed-off-by: Jan Kiszka --- .../images/isar-initramfs.bb | 2 +- .../files/initramfs-fsck-hook-ext4.triggers | 0 .../initramfs-fsck-ext4-hook_0.3.bb | 14 +++++++ .../files/initramfs.fsck.ext4.hook | 39 ------------------- .../initramfs-fsck-hook-ext4_0.2.bb | 18 --------- 5 files changed, 15 insertions(+), 58 deletions(-) rename meta/{recipes-support => recipes-initramfs}/initramfs-fsck-hook/files/initramfs-fsck-hook-ext4.triggers (100%) create mode 100644 meta/recipes-initramfs/initramfs-fsck-hook/initramfs-fsck-ext4-hook_0.3.bb delete mode 100644 meta/recipes-support/initramfs-fsck-hook/files/initramfs.fsck.ext4.hook delete mode 100644 meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-hook-ext4_0.2.bb diff --git a/meta-isar/recipes-initramfs/images/isar-initramfs.bb b/meta-isar/recipes-initramfs/images/isar-initramfs.bb index 71dbaa43..d2a946f7 100644 --- a/meta-isar/recipes-initramfs/images/isar-initramfs.bb +++ b/meta-isar/recipes-initramfs/images/isar-initramfs.bb @@ -15,5 +15,5 @@ INITRAMFS_PREINSTALL += " \ # Recipes that should be installed into the initramfs build rootfs. INITRAMFS_INSTALL += " \ initramfs-isar-example-hook \ - initramfs-fsck-hook-ext4 \ + initramfs-fsck-ext4-hook \ " diff --git a/meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-hook-ext4.triggers b/meta/recipes-initramfs/initramfs-fsck-hook/files/initramfs-fsck-hook-ext4.triggers similarity index 100% rename from meta/recipes-support/initramfs-fsck-hook/files/initramfs-fsck-hook-ext4.triggers rename to meta/recipes-initramfs/initramfs-fsck-hook/files/initramfs-fsck-hook-ext4.triggers diff --git a/meta/recipes-initramfs/initramfs-fsck-hook/initramfs-fsck-ext4-hook_0.3.bb b/meta/recipes-initramfs/initramfs-fsck-hook/initramfs-fsck-ext4-hook_0.3.bb new file mode 100644 index 00000000..9e9654ad --- /dev/null +++ b/meta/recipes-initramfs/initramfs-fsck-hook/initramfs-fsck-ext4-hook_0.3.bb @@ -0,0 +1,14 @@ +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2019-2024 +# +# SPDX-License-Identifier: MIT + +DESCRIPTION = "Recipe to add fsck hook to the initramfs" + +require recipes-initramfs/initramfs-hook/hook.inc + +SRC_URI += "file://initramfs-fsck-hook-ext4.triggers" + +HOOK_COPY_EXECS = "fsck fsck.ext4 logsave" + +DEBIAN_DEPENDS += ", e2fsprogs, logsave" diff --git a/meta/recipes-support/initramfs-fsck-hook/files/initramfs.fsck.ext4.hook b/meta/recipes-support/initramfs-fsck-hook/files/initramfs.fsck.ext4.hook deleted file mode 100644 index 259b73b4..00000000 --- a/meta/recipes-support/initramfs-fsck-hook/files/initramfs.fsck.ext4.hook +++ /dev/null @@ -1,39 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -#!/bin/sh - -set -e - -PREREQ="" - -prereqs() -{ - echo "$PREREQ" -} - -case $1 in -prereqs) - prereqs - exit 0 - ;; -esac - -. /usr/share/initramfs-tools/scripts/functions -. /usr/share/initramfs-tools/hook-functions - -if [ ! -x /sbin/fsck ]; then - echo "Warning: couldn't find /sbin/fsck!" - exit 0 -fi - -copy_exec /sbin/fsck -copy_exec /sbin/logsave - -if prog="$(command -v fsck.ext4)"; then - copy_exec "$prog" -else - echo "Warning: /sbin/fsck.ext4 doesn't exist, can't install to initramfs, ignoring." -fi diff --git a/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-hook-ext4_0.2.bb b/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-hook-ext4_0.2.bb deleted file mode 100644 index 9860dbc8..00000000 --- a/meta/recipes-support/initramfs-fsck-hook/initramfs-fsck-hook-ext4_0.2.bb +++ /dev/null @@ -1,18 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - - -DESCRIPTION = "Recipe to add fsck hook to the initramfs" - -inherit dpkg-raw -SRC_URI = "file://initramfs-fsck-hook-ext4.triggers \ - file://initramfs.fsck.ext4.hook \ - " - - -do_install() { - install -m 0755 -d ${D}/etc/initramfs-tools/hooks - install -m 0740 ${WORKDIR}/initramfs.fsck.ext4.hook ${D}/etc/initramfs-tools/hooks/fsck.ext4.hook -} -- 2.43.0 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/119732ece3ac710416516282f0cdcb5c05c9b4d1.1731358224.git.jan.kiszka%40siemens.com.