[isar-cip-core,06/19] Rename initramfs-abrootfs-secureboot to initramfs-abrootfs-hook

Commit Message

Jan Kiszka April 13, 2022, 7:16 a.m. UTC

From: Jan Kiszka <[e-mail]>

It had nothing to do with secure boot at all, only with selecting the
rootfs from the initramfs via a uuid match.

Relocate to recipes-initramfs as well at this chance as this is more
logical, even if initramfs-abrootfs-hook is not using the initramfs
image class yet.

Signed-off-by: Jan Kiszka <[e-mail]>
---
 .../initramfs-abrootfs-hook/files/debian-local-patch      | 0
 .../files/initramfs.image_uuid.hook                       | 0
 .../initramfs-abrootfs-hook}/files/initramfs.lsblk.hook   | 0
 .../initramfs-abrootfs-hook}/files/postinst               | 2 +-
 .../initramfs-abrootfs-hook_0.1.bb                        | 8 ++++----
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename recipes-support/initramfs-config/files/secure-boot-debian-local-patch => recipes-initramfs/initramfs-abrootfs-hook/files/debian-local-patch (100%)
 rename {recipes-support/initramfs-config => recipes-initramfs/initramfs-abrootfs-hook}/files/initramfs.image_uuid.hook (100%)
 rename {recipes-support/initramfs-config => recipes-initramfs/initramfs-abrootfs-hook}/files/initramfs.lsblk.hook (100%)
 rename {recipes-support/initramfs-config => recipes-initramfs/initramfs-abrootfs-hook}/files/postinst (73%)
 rename recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb => recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.1.bb (74%)

Patch

diff --git a/recipes-support/initramfs-config/files/secure-boot-debian-local-patch b/recipes-initramfs/initramfs-abrootfs-hook/files/debian-local-patch
similarity index 100%
rename from recipes-support/initramfs-config/files/secure-boot-debian-local-patch
rename to recipes-initramfs/initramfs-abrootfs-hook/files/debian-local-patch
diff --git a/recipes-support/initramfs-config/files/initramfs.image_uuid.hook b/recipes-initramfs/initramfs-abrootfs-hook/files/initramfs.image_uuid.hook
similarity index 100%
rename from recipes-support/initramfs-config/files/initramfs.image_uuid.hook
rename to recipes-initramfs/initramfs-abrootfs-hook/files/initramfs.image_uuid.hook
diff --git a/recipes-support/initramfs-config/files/initramfs.lsblk.hook b/recipes-initramfs/initramfs-abrootfs-hook/files/initramfs.lsblk.hook
similarity index 100%
rename from recipes-support/initramfs-config/files/initramfs.lsblk.hook
rename to recipes-initramfs/initramfs-abrootfs-hook/files/initramfs.lsblk.hook
diff --git a/recipes-support/initramfs-config/files/postinst b/recipes-initramfs/initramfs-abrootfs-hook/files/postinst
similarity index 73%
rename from recipes-support/initramfs-config/files/postinst
rename to recipes-initramfs/initramfs-abrootfs-hook/files/postinst
index 2d4256d..e065524 100644
--- a/recipes-support/initramfs-config/files/postinst
+++ b/recipes-initramfs/initramfs-abrootfs-hook/files/postinst
@@ -1,6 +1,6 @@ 
 #!/bin/sh
 
 # patch local script
-patch -s -p0 /usr/share/initramfs-tools/scripts/local /usr/share/secureboot/secure-boot-debian-local.patch
+patch -s -p0 /usr/share/initramfs-tools/scripts/local /usr/share/initramfs-abrootfs-hook/debian-local.patch
 
 update-initramfs -v -u
diff --git a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb b/recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.1.bb
similarity index 74%
rename from recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
rename to recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.1.bb
index 4b257fa..9c1776a 100644
--- a/recipes-support/initramfs-config/initramfs-abrootfs-secureboot_0.1.bb
+++ b/recipes-initramfs/initramfs-abrootfs-hook/initramfs-abrootfs-hook_0.1.bb
@@ -16,13 +16,13 @@  DEBIAN_DEPENDS += ", busybox, patch"
 SRC_URI += "file://postinst \
             file://initramfs.lsblk.hook \
             file://initramfs.image_uuid.hook \
-            file://secure-boot-debian-local-patch"
+            file://debian-local-patch"
 
 do_install() {
-    # add patch for local to /usr/share/secure boot
-    TARGET=${D}/usr/share/secureboot
+    # add patch for local to /usr/share/initramfs-abrootfs-hook
+    TARGET=${D}/usr/share/initramfs-abrootfs-hook
     install -m 0755 -d ${TARGET}
-    install -m 0644 ${WORKDIR}/secure-boot-debian-local-patch ${TARGET}/secure-boot-debian-local.patch
+    install -m 0644 ${WORKDIR}/debian-local-patch ${TARGET}/debian-local.patch
 
     # add hooks for secure boot
     HOOKS=${D}/etc/initramfs-tools/hooks