public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: "'Jan Kiszka' via isar-users" <isar-users@googlegroups.com>
To: Quirin Gylstorff <quirin.gylstorff@siemens.com>,
	isar-users <isar-users@googlegroups.com>
Subject: Re: [PATCH 1/7] initramfs-hook: Add infrastructure to ease writing hooks
Date: Wed, 13 Nov 2024 07:43:01 +0100	[thread overview]
Message-ID: <967fc582-9cf0-4216-8c82-f191907709e4@siemens.com> (raw)
In-Reply-To: <4c85c0de-2e3a-446e-8b2e-d5f058e11b9f@siemens.com>

On 12.11.24 11:14, Quirin Gylstorff wrote:
> 
> 
> On 11/11/24 21:50, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> xxx

Oops, forgotten to finish this.

>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>   .../initramfs-hook/files/hook-header.tmpl     | 39 ++++++++++
>>   .../initramfs-hook/files/script-header.tmpl   | 26 +++++++
>>   .../recipes-initramfs/initramfs-hook/hook.inc | 74 +++++++++++++++++++
>>   3 files changed, 139 insertions(+)
>>   create mode 100644 meta/recipes-initramfs/initramfs-hook/files/hook-
>> header.tmpl
>>   create mode 100644 meta/recipes-initramfs/initramfs-hook/files/
>> script-header.tmpl
>>   create mode 100644 meta/recipes-initramfs/initramfs-hook/hook.inc
>>
>> diff --git a/meta/recipes-initramfs/initramfs-hook/files/hook-
>> header.tmpl b/meta/recipes-initramfs/initramfs-hook/files/hook-
>> header.tmpl
>> new file mode 100644
>> index 00000000..ee30d691
>> --- /dev/null
>> +++ b/meta/recipes-initramfs/initramfs-hook/files/hook-header.tmpl
>> @@ -0,0 +1,39 @@
>> +#!/bin/sh
>> +#
>> +# Copyright (c) Siemens AG, 2024
>> +#
>> +# Authors:
>> +#  Jan Kiszka <jan.kiszka@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +
>> +set -e
>> +
>> +prereqs()
>> +{
>> +    echo "${HOOK_PREREQ}"
>> +}
>> +
>> +case $1 in
>> +prereqs)
>> +    prereqs
>> +    exit 0
>> +    ;;
>> +esac
>> +
>> +. /usr/share/initramfs-tools/hook-functions
>> +
>> +for module in ${HOOK_ADD_MODULES}; do
>> +    manual_add_modules $module
>> +done
>> +
>> +for executable in ${HOOK_COPY_EXECS}; do
>> +    if exec_path=$(command -v $executable 2>/dev/null); then
>> +        copy_exec "$exec_path"
>> +    else
>> +        echo "(ERROR): Unable to copy $executable" >&2
>> +        exit 1
>> +    fi
>> +done
>> +
>> diff --git a/meta/recipes-initramfs/initramfs-hook/files/script-
>> header.tmpl b/meta/recipes-initramfs/initramfs-hook/files/script-
>> header.tmpl
>> new file mode 100644
>> index 00000000..faa1a644
>> --- /dev/null
>> +++ b/meta/recipes-initramfs/initramfs-hook/files/script-header.tmpl
>> @@ -0,0 +1,26 @@
>> +#!/bin/sh
>> +#
>> +# Copyright (c) Siemens AG, 2024
>> +#
>> +# Authors:
>> +#  Jan Kiszka <jan.kiszka@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +
>> +set -e
>> +
>> +prereqs()
>> +{
>> +    echo "${SCRIPT_PREREQ}"
>> +}
>> +
>> +case $1 in
>> +prereqs)
>> +    prereqs
>> +    exit 0
>> +    ;;
>> +esac
>> +
>> +. /scripts/functions
>> +
>> diff --git a/meta/recipes-initramfs/initramfs-hook/hook.inc b/meta/
>> recipes-initramfs/initramfs-hook/hook.inc
>> new file mode 100644
>> index 00000000..5509c074
>> --- /dev/null
>> +++ b/meta/recipes-initramfs/initramfs-hook/hook.inc
>> @@ -0,0 +1,74 @@
>> +#
>> +# Copyright (c) Siemens AG, 2024
>> +#
>> +# Authors:
>> +#  Jan Kiszka <jan.kiszka@siemens.com>
>> +#
>> +# 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
> This supports only on file per folder is this intentional?

Yes, until someone can tell me a valid use case where one hook would
need multiple boot scripts (not talking about helpers that would be
called by the a boot script).

Jan

>> +        if [ ! -f "${WORKDIR}/$script" ]; then
>> +            continue
>> +        fi
>> +
>> +        rm -rf "${D}/usr/share/initramfs-tools/scripts/$script"
>> +        install -d -m 0755 "${D}/usr/share/initramfs-tools/scripts/
>> $script"
> 
>> +        install -m 0755 "${WORKDIR}/$script" \
>> +            "${D}/usr/share/initramfs-tools/scripts/$script/
>> ${INITRAMFS_HOOK_NAME}"
>> +    done
>> +}
> 


-- 
Siemens AG, Technology
Linux Expert Center

-- 
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/967fc582-9cf0-4216-8c82-f191907709e4%40siemens.com.

  reply	other threads:[~2024-11-13  6:43 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-11 20:50 [PATCH 0/7] Simplify writing initramfs hooks 'Jan Kiszka' via isar-users
2024-11-11 20:50 ` [PATCH 1/7] initramfs-hook: Add infrastructure to ease writing hooks 'Jan Kiszka' via isar-users
2024-11-12 10:00   ` 'Quirin Gylstorff' via isar-users
2024-11-12 10:14   ` 'Quirin Gylstorff' via isar-users
2024-11-13  6:43     ` 'Jan Kiszka' via isar-users [this message]
2024-11-13  7:47   ` [PATCH v2 " 'Jan Kiszka' via isar-users
2024-11-11 20:50 ` [PATCH 2/7] doc: Describe initramfs customizations 'Jan Kiszka' via isar-users
2024-11-11 20:50 ` [PATCH 3/7] isar-initramfs: Add initramfs-fsck-hook-ext4 'Jan Kiszka' via isar-users
2024-11-11 20:50 ` [PATCH 4/7] initramfs-isar-example-hook: Convert recipe over to new hook.inc 'Jan Kiszka' via isar-users
2024-11-11 20:50 ` [PATCH 5/7] initramfs-fsck-ext4-hook: Convert to hook.inc and improve 'Jan Kiszka' via isar-users
2024-11-11 20:50 ` [PATCH 6/7] initramfs-tee-ftpm-hook: Convert to hook.inc 'Jan Kiszka' via isar-users
2024-11-11 20:50 ` [PATCH 7/7] initramfs-tee-supplicant-hook: " 'Jan Kiszka' via isar-users

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=967fc582-9cf0-4216-8c82-f191907709e4@siemens.com \
    --to=isar-users@googlegroups.com \
    --cc=jan.kiszka@siemens.com \
    --cc=quirin.gylstorff@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox