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

Commit Message

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

From: Jan Kiszka <[e-mail]>

Reduces boilerplate code.

Signed-off-by: Jan Kiszka <[e-mail]>
---
 .../files/abrootfs.hook                       | 24 ------------------
 .../initramfs-abrootfs-hook/files/hook        |  5 ++++
 .../{abrootfs.script => local-top-complete}   |  0
 ..._0.1.bb => initramfs-abrootfs-hook_0.2.bb} | 25 ++++++++-----------
 4 files changed, 15 insertions(+), 39 deletions(-)
 delete mode 100644 recipes-initramfs/initramfs-abrootfs-hook/files/abrootfs.hook
 create mode 100644 recipes-initramfs/initramfs-abrootfs-hook/files/hook
 rename recipes-initramfs/initramfs-abrootfs-hook/files/{abrootfs.script => local-top-complete} (100%)
 rename recipes-initramfs/initramfs-abrootfs-hook/{initramfs-abrootfs-hook_0.1.bb => initramfs-abrootfs-hook_0.2.bb} (61%)

Patch

diff --git a/recipes-initramfs/initramfs-abrootfs-hook/files/abrootfs.hook b/recipes-initramfs/initramfs-abrootfs-hook/files/abrootfs.hook
deleted file mode 100644
index bacbc2ee..00000000
--- a/recipes-initramfs/initramfs-abrootfs-hook/files/abrootfs.hook
+++ /dev/null
@@ -1,24 +0,0 @@ 
-#!/bin/sh
-# Copyright (C) Siemens AG, 2020-2022
-#
-# SPDX-License-Identifier: MIT
-
-PREREQ=""
-
-prereqs()
-{
-     echo "$PREREQ"
-}
-
-case $1 in
-prereqs)
-     prereqs
-     exit 0
-     ;;
-esac
-
-. /usr/share/initramfs-tools/scripts/functions
-. /usr/share/initramfs-tools/hook-functions
-
-copy_exec /usr/bin/lsblk
-copy_file library /usr/share/abrootfs/image-uuid.env /usr/share/abrootfs/image-uuid.env
diff --git a/recipes-initramfs/initramfs-abrootfs-hook/files/hook b/recipes-initramfs/initramfs-abrootfs-hook/files/hook
new file mode 100644
index 00000000..6d4a6129
--- /dev/null
+++ b/recipes-initramfs/initramfs-abrootfs-hook/files/hook
@@ -0,0 +1,5 @@ 
+# Copyright (C) Siemens AG, 2020-2022
+#
+# SPDX-License-Identifier: MIT
+
+copy_file library /usr/share/abrootfs/image-uuid.env /usr/share/abrootfs/image-uuid.env
diff --git a/recipes-initramfs/initramfs-abrootfs-hook/files/abrootfs.script b/recipes-initramfs/initramfs-abrootfs-hook/files/local-top-complete
similarity index 100%
rename from recipes-initramfs/initramfs-abrootfs-hook/files/abrootfs.script
rename to recipes-initramfs/initramfs-abrootfs-hook/files/local-top-complete
diff --git a/recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.1.bb b/recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.2.bb
similarity index 61%
rename from recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.1.bb
rename to recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.2.bb
index 17c60da4..592f305f 100644
--- a/recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.1.bb
+++ b/recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.2.bb
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2020-2022
+# Copyright (c) Siemens AG, 2020-2024
 #
 # Authors:
 #  Quirin Gylstorff <[e-mail]>
@@ -9,17 +9,19 @@ 
 #
 # SPDX-License-Identifier: MIT
 
+require recipes-initramfs/initramfs-hook/hook.inc
 
-inherit dpkg-raw
-
-DEBIAN_DEPENDS = "initramfs-tools"
+DEBIAN_DEPENDS .= ", util-linux"
 DEBIAN_CONFLICTS = "initramfs-verity-hook"
 
-SRC_URI += "file://abrootfs.hook \
-            file://abrootfs.script"
+SRC_URI += " \
+    file://hook \
+    file://local-top-complete"
 
 ABROOTFS_IMAGE_RECIPE ?= "cip-core-image"
 
+HOOK_COPY_EXECS = "lsblk"
+
 # This is defined in image.bbclass which cannot be used in a package recipe.
 # However, we need to use IMAGE_FULLNAME to pick up any extensions of it.
 IMAGE_FULLNAME ??= "${ABROOTFS_IMAGE_RECIPE}-${DISTRO}-${MACHINE}"
@@ -27,19 +29,12 @@  IMAGE_FULLNAME ??= "${ABROOTFS_IMAGE_RECIPE}-${DISTRO}-${MACHINE}"
 IMAGE_UUID_ENV_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.uuid.env"
 
 do_install[depends] += "${ABROOTFS_IMAGE_RECIPE}:do_generate_image_uuid"
-do_install[cleandirs] += " \
-    ${D}/usr/share/initramfs-tools/hooks \
-    ${D}/usr/share/abrootfs \
-    ${D}/usr/share/initramfs-tools/scripts/local-top"
+do_install[cleandirs] += "${D}/usr/share/abrootfs"
 
-do_install() {
+do_install:append() {
     if [ -f "${IMAGE_UUID_ENV_FILE}" ]; then
         install -m 0600 "${IMAGE_UUID_ENV_FILE}" "${D}/usr/share/abrootfs/image-uuid.env"
     else
         bberror "Did not find ${IMAGE_UUID_ENV_FILE}. initramfs will not be build correctly!"
     fi
-    install -m 0755 "${WORKDIR}/abrootfs.script" \
-        "${D}/usr/share/initramfs-tools/scripts/local-top/abrootfs"
-    install -m 0755 "${WORKDIR}/abrootfs.hook" \
-        "${D}/usr/share/initramfs-tools/hooks/abrootfs"
 }