[isar-cip-core,08/10] initramfs-verity-hook: Convert to hook.inc

Commit Message

Jan Kiszka Dec. 2, 2024, 2:51 p.m. UTC

From: Jan Kiszka <[e-mail]>

Simplifies the code.

Signed-off-by: Jan Kiszka <[e-mail]>
---
 .../initramfs-verity-hook/files/hook          |  5 ++++
 ...ty.script.tmpl => local-top-complete.tmpl} |  0
 .../initramfs-verity-hook/files/verity.hook   | 23 -------------------
 .../initramfs-verity-hook_0.2.bb              | 22 ++++++++----------
 4 files changed, 14 insertions(+), 36 deletions(-)
 create mode 100644 recipes-initramfs/initramfs-verity-hook/files/hook
 rename recipes-initramfs/initramfs-verity-hook/files/{verity.script.tmpl => local-top-complete.tmpl} (100%)
 delete mode 100644 recipes-initramfs/initramfs-verity-hook/files/verity.hook

Patch

diff --git a/recipes-initramfs/initramfs-verity-hook/files/hook b/recipes-initramfs/initramfs-verity-hook/files/hook
new file mode 100644
index 00000000..1550dafe
--- /dev/null
+++ b/recipes-initramfs/initramfs-verity-hook/files/hook
@@ -0,0 +1,5 @@ 
+# SPDX-License-Identifier: MIT
+# Copyright (c) Siemens AG, 2021-2024
+
+copy_file library /lib/cryptsetup/functions /lib/cryptsetup/functions
+copy_file library /usr/share/verity-env/verity.env /usr/share/verity-env/verity.env
diff --git a/recipes-initramfs/initramfs-verity-hook/files/verity.script.tmpl b/recipes-initramfs/initramfs-verity-hook/files/local-top-complete.tmpl
similarity index 100%
rename from recipes-initramfs/initramfs-verity-hook/files/verity.script.tmpl
rename to recipes-initramfs/initramfs-verity-hook/files/local-top-complete.tmpl
diff --git a/recipes-initramfs/initramfs-verity-hook/files/verity.hook b/recipes-initramfs/initramfs-verity-hook/files/verity.hook
deleted file mode 100644
index 5eada8a0..00000000
--- a/recipes-initramfs/initramfs-verity-hook/files/verity.hook
+++ /dev/null
@@ -1,23 +0,0 @@ 
-#!/bin/sh
-PREREQ=""
-prereqs()
-{
-    echo "$PREREQ"
-}
-case $1 in
-prereqs)
-    prereqs
-    exit 0
-    ;;
-esac
-
-. /usr/share/initramfs-tools/hook-functions
-# Begin real processing below this line
-
-manual_add_modules dm_mod
-manual_add_modules dm_verity
-
-copy_exec /sbin/veritysetup
-copy_exec /sbin/dmsetup
-copy_file library /lib/cryptsetup/functions /lib/cryptsetup/functions
-copy_file library /usr/share/verity-env/verity.env /usr/share/verity-env/verity.env
diff --git a/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.2.bb b/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.2.bb
index 6db4efcc..d8f62bb4 100644
--- a/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.2.bb
+++ b/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.2.bb
@@ -9,21 +9,24 @@ 
 # SPDX-License-Identifier: MIT
 #
 
-inherit dpkg-raw
+require recipes-initramfs/initramfs-hook/hook.inc
 
 SRC_URI += " \
-    file://verity.hook \
-    file://verity.script.tmpl \
+    file://hook \
+    file://local-top-complete.tmpl \
     "
 
 VERITY_BEHAVIOR_ON_CORRUPTION ?= "--restart-on-corruption"
 
-TEMPLATE_FILES = "verity.script.tmpl"
+TEMPLATE_FILES += "local-top-complete.tmpl"
 TEMPLATE_VARS += "VERITY_BEHAVIOR_ON_CORRUPTION"
 
 DEBIAN_DEPENDS = "initramfs-tools, cryptsetup"
 DEBIAN_CONFLICTS = "initramfs-abrootfs-hook"
 
+HOOK_ADD_MODULES = "dm_mod dm_verity"
+HOOK_COPY_EXECS = "veritysetup dmsetup"
+
 VERITY_IMAGE_RECIPE ?= "cip-core-image"
 
 # This is defined in image.bbclass which cannot be used in a package recipe.
@@ -33,22 +36,15 @@  IMAGE_FULLNAME ??= "${VERITY_IMAGE_RECIPE}-${DISTRO}-${MACHINE}"
 VERITY_ENV_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.verity.env"
 
 do_install[depends] += "${VERITY_IMAGE_RECIPE}:do_image_verity"
-do_install[cleandirs] += " \
-    ${D}/usr/share/initramfs-tools/hooks \
-    ${D}/usr/share/verity-env \
-    ${D}/usr/share/initramfs-tools/scripts/local-top"
+do_install[cleandirs] += "${D}/usr/share/verity-env"
 
-do_install() {
+do_install:append() {
     # Insert the veritysetup commandline into the script
     if [ -f "${VERITY_ENV_FILE}" ]; then
         install -m 0600 "${VERITY_ENV_FILE}" "${D}/usr/share/verity-env/verity.env"
     else
         bberror "Did not find ${VERITY_ENV_FILE}. initramfs will not be build correctly!"
     fi
-    install -m 0755 "${WORKDIR}/verity.script" \
-        "${D}/usr/share/initramfs-tools/scripts/local-top/verity"
-    install -m 0755 "${WORKDIR}/verity.hook" \
-        "${D}/usr/share/initramfs-tools/hooks/verity"
 }
 
 addtask install after do_transform_template