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, 03 Nov 2025 12:52:38 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 5A3BqZ4C001029 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 3 Nov 2025 12:52:36 +0100 Received: by mail-wm1-f61.google.com with SMTP id 5b1f17b1804b1-475dca91610sf23002195e9.3 for ; Mon, 03 Nov 2025 03:52:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1762170742; cv=pass; d=google.com; s=arc-20240605; b=ShQ4NGgyHlEcPuOgGGqHuve2vec4fAxc5Oa1Yb5UgzMwt9tFYxD7d6IyMb1FVA1peH 233CBtKL71Hdf2HEmVqOU/3LLOqnpiOT2UaBe1hBqQvHEsqIcS1WGRlv1oN2BrKVlE0H NqmWJBXVWuvo68tCFZia1HQljTjxe0sg+Y5KL8x6zsBgj77culfpaopA7wSu6KkqMwRP ZXdwwsLb3panwb+C9CowshUWU1JEukU83v2BNRvokp39FarUHdQXSnnimSFUDBww5or4 nW5hQ3n6xBlkaCJIF1EQANt+ANMSsu9wtomQA7V4d+d0VAAFyJPG/cPVbJUulLv9T8M2 eMFw== 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=yx9o3eyz23goQKDiGj5VijnifeD6Szl8dbIcdGxeSm0=; fh=OIM5+3O1Sw3KY3Ij0ckCdaVI5j4G1AIpEgpnz0JbJ3s=; b=F3EO92ea+LXbRpYpDwzQsRtyEuvfYERClIDuGDkGiWQZ+/ZQgvpO4EmLvkxtX4SUJB 2FjyuKou4uazgw9ssSXP0LN2vHrhylUPxEBhVPgqgDUrlAiDRhVh112mZobHsBKfAEWk 9MpKKVdm2J3ZfyxdeJ4nRjPD3owi8TKVYpOhluVjGAIOL1lvxoEEpoxEVJNsqSfBy55a CT+Aokl9Hxmb/7WuXXdVOefhU1tpMyU1sZkqUAYiXYwQ+skit9QLoGhDT0CfS4Py65sx Ao6a8QNjvoR+4+xzBOk/iwUo8Mc3oSSEQVSpqFIhqoG3Hmy7Xz0Zc0mj+GeQ3Lu6mI+d QKjw==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Fe+q1u2f; spf=pass (google.com: domain of fm-294854-202511031152189e273cd939000207f0-2fa1qs@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202511031152189e273cd939000207f0-2Fa1Qs@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=1762170742; x=1762775542; 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=yx9o3eyz23goQKDiGj5VijnifeD6Szl8dbIcdGxeSm0=; b=CqjEECjLnz0Eeiubywa/7zdWVDm9+M6P/BXjMQcGPMGpJZXaF8AKOH8jkFbT0YFRsI bXaxWGwmfFDy5vSP1pkJ3Yzi/zp8AGEmXSGItTFhKb6aREQXf5m5beiCJFgK9Q4hik6U Le4yhmhmf2LRb7ta33BLhcY/FeOWWSdfv++UVpMTl4sPwYeYiK19zEbbhNznG6v+SiVr 0hQcW46lk9+5C8N1t0t8cYheb3xmvsmNFyMnUGD8kXuLRrgGUmLXz0q/Anljn21KCX3a 1Y8qB5+wJkHK1V+tkU8bWsWHjYf2LEUO58I3/2ffHQHhyOKur3JdRw1rqoiXvIjo8BUo cJEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762170742; x=1762775542; 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=yx9o3eyz23goQKDiGj5VijnifeD6Szl8dbIcdGxeSm0=; b=q+KxYKw8jWJ4vmSwbFehd1sZLpqwC1WTyaKcI2TdUphVOvGWI/w5jkFIW367IfCRp9 QbO7VHvq057IuK6HWXPsyZuw+w015U9+WxyGOswvkzc7z0lGuU/2Q1lGUI2PqebcgOVY UwNwyNYzaYKcPiuvODf7oncfKUGyiR3yQZFq/QcMBwZ7Q8uqyuZ9I8PHU/OI5rPgTgmr a0oJ6lFBNN0fX3jGjSz3mDDDq9igFBtNPiWqquIZ1XTyywv9aUaoVT1SMAAsNz/QSDIW KZ/3NdsOXqD5fjzDohySeTXgeKNbi4LZGu17RrYJ41EO//SMiAPcQpVxGCXLrxjHmBdC ZTMA== X-Forwarded-Encrypted: i=2; AJvYcCXvEJzLhEkCoGG66noYuskz7RTX9YEqz/IWWQt+9Rw02bUqfur/lFxyQjfQgwUiIlZdvZMp@ilbers.de X-Gm-Message-State: AOJu0YwPbZGbKuaoHpOqqSW9Fd83bNk/cP6CS5kPLFJjH7NtJz9y1za2 U4qSXu3gFljmCtgpdkaSBrMcXBo5z0tpWmZaFzVCD4SoALDOjh4J1hW4 X-Google-Smtp-Source: AGHT+IFEF635yngB2Yh2W6YG3axPN1oCXzQrBjl/tdnvxvTa69Eah+y5OOrUnVrv2qteDDTTpr3lyg== X-Received: by 2002:a05:600c:4e49:b0:46e:4246:c90d with SMTP id 5b1f17b1804b1-477307e22f7mr100809605e9.11.1762170742142; Mon, 03 Nov 2025 03:52:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="Ae8XA+YggHCgNoO1nD4LryYKpLMeriPuGZC1LEoF2niZvFipiw==" Received: by 2002:a05:6000:25c4:b0:429:c4ad:e771 with SMTP id ffacd0b85a97d-429c4adf286ls2023642f8f.0.-pod-prod-08-eu; Mon, 03 Nov 2025 03:52:19 -0800 (PST) X-Received: by 2002:a05:6000:2204:b0:429:b525:6dc2 with SMTP id ffacd0b85a97d-429bd680bf8mr9508336f8f.17.1762170739043; Mon, 03 Nov 2025 03:52:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1762170739; cv=none; d=google.com; s=arc-20240605; b=Q9qlrFFRMbAa6P8Zff8v4SS14JfBgTH+AGJ9HM0RZT3GRQO5AlElOiePe7qCBH65LR bUKD9zvq17BJSV4s+1xkU1P+E2NkVuLJFypvAnM8JZKAhVpBQ9DVbVCFbyM+YdFEUv8A hUCdo1y3H/TRs40Nr+Sqmv/1zCxSCoSICVl3U/P4E0VZnCiILJ22/ooIJRw0u4KCBZlR rqoz4pRgfMLbYRMEpMZFcFe52IXAoZ6d7/uTCbffQEbeOBXHSP7vLIy6FG8LoH20CM5s pt10fL7CNI16kh1OR9GTswAk/DjchUbz+qOtbxwPoGmPUCJnGniMZ9DyZcFHo6dhd5m9 j60w== 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=gu3+OH1pX+RMhUc3bwt8Opof2Z4K3ZiJG6DbKPTonuBUIJBocWH13tkrmwz2m2Wot0 Q5UGesPVcWSlspt68iCPlehd+IEz49RBj4RS2t91u2ZBvexkc8x1DphlEN2NFo/AnUbR ecu8KLmI0HiQmS6R+MBNQo/KKucJuCAJ7wHn/+cRNt6VwGPo6+JTIrPWIkkzzMtoDU19 HmrNp4dO26k1i4QHZICL0M5fTKSPTW5/MiW9iIWHHZGY24Uxr7lQGhAsajMXoQ4dRByO tWmHngBZtvwlFzBgr7Oxbo5DGolAHfG9qXAZgaGnJpTMN0sBud27x+6L+aceWizfiEUv 8BDQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=Fe+q1u2f; spf=pass (google.com: domain of fm-294854-202511031152189e273cd939000207f0-2fa1qs@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202511031152189e273cd939000207f0-2Fa1Qs@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-429cf2d4cabsi95112f8f.1.2025.11.03.03.52.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2025 03:52:19 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202511031152189e273cd939000207f0-2fa1qs@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202511031152189e273cd939000207f0 for ; Mon, 03 Nov 2025 12:52:19 +0100 From: "'Jan Kiszka' via isar-users" To: isar-users Subject: [PATCH 23/27] initramfs-hook: Migrate to a bbclass Date: Mon, 3 Nov 2025 12:52:11 +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=Fe+q1u2f; spf=pass (google.com: domain of fm-294854-202511031152189e273cd939000207f0-2fa1qs@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202511031152189e273cd939000207f0-2Fa1Qs@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: oKEui1Cxf82D 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/cf867c1d0ef5095dc9cb88fbe27d45fdc1df9a84.1762170735.git.jan.kiszka%40siemens.com.