Re: [isar-cip-core][PATCH v2 2/6] initramfs-abrootfs-hook: Convert to an initramfs-class recipe

From: Jan Kiszka <jan.kiszka@siemens.com>
To: <cip-dev@lists.cip-project.org>
Cc: Quirin Gylstorff <quirin.gylstorff@siemens.com>,
	Christian Storm <christian.storm@siemens.com>
Subject: Re: [isar-cip-core][PATCH v2 2/6] initramfs-abrootfs-hook: Convert to an initramfs-class recipe
Date: Fri, 22 Apr 2022 18:59:48 +0200	[thread overview]
Message-ID: <967ff119-c3cc-6340-c4ce-471d6dd95d9f@siemens.com> (raw)
In-Reply-To: <bec2642fc52c2cb38eade4569b88315dfa5dade6.1650613658.git.jan.kiszka@siemens.com>

On 22.04.22 09:47, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This unifies the pattern we generate initramfs images for non-secure and
> secure SWUpdate images. Besides cleaning up the related abrootfs
> selection hook, the unification is a precondition for adding another
> initramfs recipe later that will be shared between both image types
> 
> The pattern followed in the new initramfs-abrootfs-hook script is now
> similar to initramfs-verity-hook: a local-top hook is used, rather than
> a patch for Debian's local script. This hook looks for the matching
> rootfs by read-only mounting candidates, comparing the contained UUID
> against the one stored in the initramfs, unmounting again, and then
> setting the ROOT variable on match.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  classes/image_uuid.bbclass                    |  6 +-
>  classes/secure-wic-swu-img.bbclass            |  4 --
>  classes/wic-swu-img.bbclass                   |  6 ++
>  kas/opt/ebg-secure-boot-snakeoil.yml          |  1 +
>  kas/opt/ebg-swu.yml                           |  2 +-
>  .../cip-core-initramfs/cip-core-initramfs.bb  |  4 --
>  .../{initramfs.lsblk.hook => abrootfs.hook}   | 11 +---
>  .../files/abrootfs.script                     | 66 +++++++++++++++++++
>  .../files/initramfs.image_uuid.hook           | 33 ----------
>  .../initramfs-abrootfs-hook/files/postinst    |  6 --
>  .../initramfs-abrootfs-hook_0.1.bb            | 41 +++++++-----
>  11 files changed, 104 insertions(+), 76 deletions(-)
>  rename recipes-initramfs/initramfs-abrootfs-hook/files/{initramfs.lsblk.hook => abrootfs.hook} (62%)
>  create mode 100644 recipes-initramfs/initramfs-abrootfs-hook/files/abrootfs.script
>  delete mode 100644 recipes-initramfs/initramfs-abrootfs-hook/files/initramfs.image_uuid.hook
>  delete mode 100644 recipes-initramfs/initramfs-abrootfs-hook/files/postinst
> 
> diff --git a/classes/image_uuid.bbclass b/classes/image_uuid.bbclass
> index 2813ed9..7294eb3 100644
> --- a/classes/image_uuid.bbclass
> +++ b/classes/image_uuid.bbclass
> @@ -1,10 +1,11 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2020
> +# Copyright (c) Siemens AG, 2020-2022
>  #
>  # Authors:
>  #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#  Jan Kiszka <jan.kiszka@siemens.com>
>  #
>  # SPDX-License-Identifier: MIT
>  #
> @@ -27,7 +28,6 @@ do_generate_image_uuid() {
>          sudo tee -a '${IMAGE_ROOTFS}/etc/os-release'
>      image_do_mounts

This line is obsolete.

>  
> -    # update initramfs to add uuid
> -    sudo chroot '${IMAGE_ROOTFS}' update-initramfs -u
> +    echo "TARGET_IMAGE_UUID=\"${IMAGE_UUID}\"" > "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.uuid.env"
>  }
>  addtask generate_image_uuid before do_copy_boot_files after do_rootfs_install

This one as well, plus it broke when no one else used DEPLOY_DIR_IMAGE
before. v3 will follow, fixing a similar issue in verity-img.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux