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, 10 Nov 2025 08:22:59 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f55.google.com (mail-lf1-f55.google.com [209.85.167.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5AA7MvpD015661 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 10 Nov 2025 08:22:58 +0100 Received: by mail-lf1-f55.google.com with SMTP id 2adb3069b0e04-5942c1f786asf1092090e87.0 for ; Sun, 09 Nov 2025 23:22:57 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762759369; cv=pass; d=google.com; s=arc-20240605; b=Nq33LQrM26b37wTmQ+p/T/eG+mv9CNg6Bqf1s28HEm8aqnsEdzfgbZfpeF1mO4sZJa UD8a4/ZlAezZ4wy6X+aFEZ+n7xQvA3D7CvWeiIxSGLVfc7nNq0BjK1OR+5erqxpeohcW 9m2fOXV4tPhvOAoMcVkUMvosxxxOJN/ge9UmrMY7Ga2kDKgPix9wSgrNmwObCjUtj86Q XoCyHbLn19xjCQRAwlkheC44ZJv1ypfeSlkxeYG5qMg5StXcfStqgo/UvZkwpKiOphqF rZnKRSUEZwC8ak8e2QEEkwK34xUu2Ocd9VMan3RLnjfrMHc7eOA+stJWgaINx62xZyHE vYRA== 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:to:from :dkim-signature; bh=yMX5CRAAwq2cX27MhJlbn8A9rgqDYWo3ilitG2oTdkk=; fh=OxlXDwmNawx0coFDteH3uOcOQJyaV7HgqXJsq/wyJSI=; b=NTKoP0sGqBvVCrju5TZfTCMLsKmPh1EsIRx5+pBrVp5Q64zOZs+zB8n9ktip0Yw+1E bU0ZhTkjOhWyv2aqjEvTBTnqk700pZTyT6VtHH3nmb9rpo8QEP+xO8TFyNITUL7hcvgf gu6i8r+4/OQQVo9ZBZzRLd+/VkK+8oUTOQiGPczOCs4U1DMntijWE8rulIn1asRzxeBv G/kW1aWSSmO3NJw8ZVdWQkgIM+077AGtOgY2KJLsJ258yXEe1ej7srIsMuQWZvNme8no sRFALnZXgO0W9lkOP/t7YlOfC9UwN3LEu0ys8+MMrNw4nDWx+vEeku61wS2WbrogvDl1 eftQ==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FO4nBDs2; spf=pass (google.com: domain of fm-294854-20251110072244a20f0222f2000207a1-rrcit7@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251110072244a20f0222f2000207a1-RrCiT7@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=1762759369; x=1763364169; 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:to:from :from:to:cc:subject:date:message-id:reply-to; bh=yMX5CRAAwq2cX27MhJlbn8A9rgqDYWo3ilitG2oTdkk=; b=kO3ggMxdO9zXNsa8ybd9mQURISKCPoMhgcYjbNiHXKFQYP9kUSGVKyQf5+FBii2EkV Ax8KDS2GrG+vSWw27yfjEKCXwZazajyVswNll791LyN1K8VjmgReeTMSkw/MwjwpVP/8 FWfmrfvkp1ZF7f2NGuKyWhxienAonuWFsyXtIwAa7a7EESpdOCJg0HldoNFIhl1UUEIi I6peiupBsEXG9QP6K5tmy2bEn8FEdjkRC0pr3H9WU02WB/B2Zdw5AMAvw4Wj41uOpSmc sHDctEkgHT4mdKJihbm6CmPbkBn1jBcw3GOFan8R+92Sze6giH0ddQT7XCmln6fHFk+F tpWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762759369; x=1763364169; 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=yMX5CRAAwq2cX27MhJlbn8A9rgqDYWo3ilitG2oTdkk=; b=PxqG7sLD8w/RhigkyIU8LEzhf5haPb9MHt7Xws2sAlt1C6qDvVI53q1l/NiKaiWll2 6etZEDuj4QvtjencQqv1VxzDwbjlO6OGCEyi1g44jbkl6Z4Omy1WwmN6hcA3bNjZoKGT X4gD8J/3My7UtXdk7DNlUT7PGGn0sihor6JSWkKk10pMF5gA6trMTUxyQVKA4wOAp9vy 4zlJT7bgDqhDIUMGif20Rl4ygg4rdJVWO9pGrdBj1XxftZVpuNUT8Z5H/besKVpF6Jj6 sRorBt5jCgPEXompyyJu2V2M308v44RFum5XHAogzOeZKPZZCbfzxTjHTeKrzjzNCoVR +zSg== X-Forwarded-Encrypted: i=2; AJvYcCWKe0FhtKBbA1TKUKX4KJbaW7Ug1aCxg94XB3A0NfTJTeL24Oo7zxKRCD5mPyxvjGEHKmQb@ilbers.de X-Gm-Message-State: AOJu0Yww+nyr87BNA3yQlpYw9pAKtG5ahCdsp8CgeplWNmBP7xZ8eQgW jZnKltqIW425iCe6UsfLzVjBJoBkHBk9siRXGZMgU+zxmqZ53+Fc8/Pg X-Google-Smtp-Source: AGHT+IEQIDsM2tIiI2F1Ec7pbRmoguHsKQLVC9zSPLBdzgm8Krj+DNaGVkwQ2chxoYpkXURHyAy3SQ== X-Received: by 2002:ac2:4c46:0:b0:594:2e37:8091 with SMTP id 2adb3069b0e04-5945f1c26famr2164638e87.48.1762759368417; Sun, 09 Nov 2025 23:22:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+ZkE4C+gztJuOxyoVl2DDhQWvQGcceEnEGDdOhMBk2Oow==" Received: by 2002:a05:6512:24ca:b0:594:4a6e:fd73 with SMTP id 2adb3069b0e04-5944a6efdd4ls1059292e87.0.-pod-prod-09-eu; Sun, 09 Nov 2025 23:22:45 -0800 (PST) X-Received: by 2002:a2e:6e14:0:b0:378:ccee:5bb4 with SMTP id 38308e7fff4ca-37a7b2d54a3mr14349121fa.25.1762759365237; Sun, 09 Nov 2025 23:22:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762759365; cv=none; d=google.com; s=arc-20240605; b=FVZNwj8NzZb1SoLF8yJydZRdCDDIOe7ENKcH5Z4ux+7RJZsCufLy/BISM+my55Cx5u FwoRCQBT2ISHibyLso3bnw56oEM8gCpOYQ/5iCzwzcAQSS8m3XCsWEQx4zCNTaVAr0+9 jNaycCzVBKStbhomSE2z44GsCwJetDxngh6DWpMzLnoi3B8uP8zv3lCr+mzSSEKyKqWo lfrP9z6BeTx/m38RZfV7veWtw/8a3p+u9Nbx7CMKXqlAkJh8ecT4NLFD1p2645KE9Gz3 NcoGH93Ry3jzbkSgli0w0s+P50LQ+o6RT/KwLLioDRWF7l5PZ8m/2MUCLWgTezkBHsE2 KWyA== 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:to:from:dkim-signature; bh=Au9QBKL1iVDfSfo7aj3b1DAa09g8h0NRSVLIzgn1slo=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=S2wye18j/7c2hc1NksVh4gAPgcNb4ENfdHais8phzkQ53mDTlSHDdI69JYA/dnJXYw ws9hXqwUoXmTZZ3wpeq0PecEzfOC2rfVfGHrC5aWHcdEiKtysXXJwnEXQa5aAlLmykVZ dJqD67ZeAZ7xtg16HhBhcd2JhR+/pz5AHyFqo5fb+z3/3CPD/AOjZegKcLW79T4/zKOK JdV+tzFZOgXvXRZLF82ZJ21HiV8I+HtDL1DzzvdQDXqYmwiGWzMhR1ZB4gBDCWm1iUys d+5ay2yMnWz79IVjGXdluhowPLLG98jJeQQpWDqQ8LNaMK7rm1Mkg4W1ftY+qxaV4YU5 eZhw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=FO4nBDs2; spf=pass (google.com: domain of fm-294854-20251110072244a20f0222f2000207a1-rrcit7@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251110072244a20f0222f2000207a1-RrCiT7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-37a5f0ff762si551511fa.6.2025.11.09.23.22.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Nov 2025 23:22:45 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20251110072244a20f0222f2000207a1-rrcit7@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20251110072244a20f0222f2000207a1 for ; Mon, 10 Nov 2025 08:22:45 +0100 From: "'Jan Kiszka' via isar-users" To: isar-users Subject: [PATCH v2 23/27] initramfs-hook: Migrate to a bbclass Date: Mon, 10 Nov 2025 08:22:36 +0100 Message-ID: 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=FO4nBDs2; spf=pass (google.com: domain of fm-294854-20251110072244a20f0222f2000207a1-rrcit7@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20251110072244a20f0222f2000207a1-RrCiT7@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: PhV+cpesfjPg From: Jan Kiszka "inherit initramfs-hook" is shorter and a more common pattern compared to OE/yocto. Keep the original .inc file as transitional helper, issuing a warning when it's used with a migration suggestion. Signed-off-by: Jan Kiszka --- doc/user_manual.md | 5 +- .../initramfs-hook.bbclass} | 5 +- .../recipes-initramfs/initramfs-hook/hook.inc | 82 ++----------------- 3 files changed, 11 insertions(+), 81 deletions(-) copy meta/{recipes-initramfs/initramfs-hook/hook.inc => classes-recipe/initramfs-hook.bbclass} (94%) diff --git a/doc/user_manual.md b/doc/user_manual.md index b577f76c..3064c17b 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -1691,9 +1691,8 @@ Debian-generated image with a separately built one. ### Creating initramfs hooks To create an initramfs hook that adds tools or modules to the image and may -also run custom scripts during boot, use the include file -`recipes-initramfs/initramfs-hook/hook.inc`. It is controlled via a number of -variables: +also run custom scripts during boot, use the `initramfs-hook` class. It is +controlled via a number of variables: - `HOOK_PREREQ` defines the prerequisites for running the hook script. - `HOOK_ADD_MODULES` passes the provided modules names to the diff --git a/meta/recipes-initramfs/initramfs-hook/hook.inc b/meta/classes-recipe/initramfs-hook.bbclass similarity index 94% copy from meta/recipes-initramfs/initramfs-hook/hook.inc copy to meta/classes-recipe/initramfs-hook.bbclass index c80b781d..ef3ae06e 100644 --- a/meta/recipes-initramfs/initramfs-hook/hook.inc +++ b/meta/classes-recipe/initramfs-hook.bbclass @@ -1,5 +1,5 @@ # -# Copyright (c) Siemens AG, 2024 +# Copyright (c) Siemens AG, 2024-2025 # # Authors: # Jan Kiszka @@ -7,10 +7,9 @@ # SPDX-License-Identifier: MIT # -FILESPATH:append := ":${FILE_DIRNAME}/files" - inherit dpkg-raw +FILESPATH:append = ":${LAYERDIR_core}/recipes-initramfs/initramfs-hook/files" SRC_URI = " \ file://hook-header.tmpl \ file://script-header.tmpl" diff --git a/meta/recipes-initramfs/initramfs-hook/hook.inc b/meta/recipes-initramfs/initramfs-hook/hook.inc index c80b781d..0ef89154 100644 --- a/meta/recipes-initramfs/initramfs-hook/hook.inc +++ b/meta/recipes-initramfs/initramfs-hook/hook.inc @@ -1,81 +1,13 @@ +# Transitional include for u-boot.bbclass # -# Copyright (c) Siemens AG, 2024 -# -# Authors: -# Jan Kiszka +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2025 # # SPDX-License-Identifier: MIT -# - -FILESPATH:append := ":${FILE_DIRNAME}/files" - -inherit dpkg-raw - -SRC_URI = " \ - file://hook-header.tmpl \ - file://script-header.tmpl" - -TEMPLATE_FILES = " \ - hook-header.tmpl \ - script-header.tmpl" - -TEMPLATE_VARS:append = " \ - HOOK_PREREQ \ - HOOK_ADD_MODULES \ - HOOK_COPY_EXECS \ - SCRIPT_PREREQ" - -HOOK_PREREQ ?= "" -HOOK_ADD_MODULES ?= "" -HOOK_COPY_EXECS ?= "" -SCRIPT_PREREQ ?= "" - -DEBIAN_DEPENDS = "initramfs-tools" - -def get_initramfs_hook_name(d): - name = d.getVar('BPN') - if name.startswith("initramfs-"): - name = name[10:] - if name.endswith("-hook"): - name = name[:-5] - return name - -INITRAMFS_HOOK_NAME ?= "${@get_initramfs_hook_name(d)}" - -do_install() { - if [ -f "${WORKDIR}/hook" ] || [ -n "${HOOK_COPY_EXECS}" ] || \ - [ -n "${HOOK_ADD_MODULES}" ]; then - rm -rf "${D}/usr/share/initramfs-tools/hooks" - install -d -m 0755 "${D}/usr/share/initramfs-tools/hooks" - - install -m 0755 "${WORKDIR}/hook-header" \ - "${D}/usr/share/initramfs-tools/hooks/${INITRAMFS_HOOK_NAME}" - if [ -f "${WORKDIR}/hook" ]; then - cat "${WORKDIR}/hook" >> \ - "${D}/usr/share/initramfs-tools/hooks/${INITRAMFS_HOOK_NAME}" - else - echo "exit 0" >> \ - "${D}/usr/share/initramfs-tools/hooks/${INITRAMFS_HOOK_NAME}" - fi - fi - for script in init-top init-premount local-top nfs-top local-block \ - local-premount nfs-premount local-bottom nfs-bottom \ - init-bottom; do - if [ ! -f "${WORKDIR}/$script" ] && [ ! -f "${WORKDIR}/${script}-complete" ]; then - continue - fi +inherit initramfs-hook - rm -rf "${D}/usr/share/initramfs-tools/scripts/$script" - install -d -m 0755 "${D}/usr/share/initramfs-tools/scripts/$script" - if [ -f "${WORKDIR}/${script}" ]; then - install -m 0755 "${WORKDIR}/script-header" \ - "${D}/usr/share/initramfs-tools/scripts/$script/${INITRAMFS_HOOK_NAME}" - cat "${WORKDIR}/$script" >> \ - "${D}/usr/share/initramfs-tools/scripts/$script/${INITRAMFS_HOOK_NAME}" - else - install -m 0755 "${WORKDIR}/${script}-complete" \ - "${D}/usr/share/initramfs-tools/scripts/$script/${INITRAMFS_HOOK_NAME}" - fi - done +do_warn_custom_inc() { + bbwarn "Please migrate from \"require recipes-initramfs/initramfs-hook/hook.inc\" to \"inherit initramfs-hook\"" } +addtask warn_custom_inc before do_unpack -- 2.51.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/ebed617114508ba2563310fe92f3eebbf2b25325.1762759360.git.jan.kiszka%40siemens.com.