| Message ID | 20241203070034.1124199-1-srinuvasan.a@siemens.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [isar-cip-core] recipes-initramfs: remove redundant initramfs-tools DEBIAN_DEPENDS | expand |
On 03.12.24 08:00, srinuvasan.a@siemens.com wrote: > From: srinuvasan <srinuvasan.a@siemens.com> > > With the inclusion of hook.inc in the initramfs recipes, the initramfs-tools > defined in the DEBIAN_DEPENDS, hence no need to add it externally in the recipes, > just cleaned that. > > Signed-off-by: srinuvasan <srinuvasan.a@siemens.com> > --- > .../initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb | 2 +- > .../initramfs-verity-hook/initramfs-verity-hook_0.2.bb | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb > index e6ac1e9..a9e4ca2 100644 > --- a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb > +++ b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb > @@ -40,7 +40,7 @@ TEMPLATE_VARS += " INITRAMFS_OVERLAY_STORAGE_PATH \ > INITRAMFS_OVERLAY_MOUNT_OPTION \ > INITRAMFS_OVERLAY_RECOVERY_SCRIPT" > > -DEBIAN_DEPENDS = "initramfs-tools, awk, coreutils, util-linux" > +DEBIAN_DEPENDS .= ", awk, coreutils, util-linux" > > HOOK_ADD_MODULES = "overlay" > HOOK_ADD_EXECS = "mountpoint awk e2fsck mke2fs" > 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 d8f62bb..a6c4666 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 > @@ -21,7 +21,7 @@ VERITY_BEHAVIOR_ON_CORRUPTION ?= "--restart-on-corruption" > TEMPLATE_FILES += "local-top-complete.tmpl" > TEMPLATE_VARS += "VERITY_BEHAVIOR_ON_CORRUPTION" > > -DEBIAN_DEPENDS = "initramfs-tools, cryptsetup" > +DEBIAN_DEPENDS .= ", cryptsetup" > DEBIAN_CONFLICTS = "initramfs-abrootfs-hook" > > HOOK_ADD_MODULES = "dm_mod dm_verity" Thanks, good catches, missed during refactoring. Applied on top of the current patches as these are "just" cleanups, not fixes. Jan
diff --git a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb index e6ac1e9..a9e4ca2 100644 --- a/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb +++ b/recipes-initramfs/initramfs-overlay-hook/initramfs-overlay-hook_0.2.bb @@ -40,7 +40,7 @@ TEMPLATE_VARS += " INITRAMFS_OVERLAY_STORAGE_PATH \ INITRAMFS_OVERLAY_MOUNT_OPTION \ INITRAMFS_OVERLAY_RECOVERY_SCRIPT" -DEBIAN_DEPENDS = "initramfs-tools, awk, coreutils, util-linux" +DEBIAN_DEPENDS .= ", awk, coreutils, util-linux" HOOK_ADD_MODULES = "overlay" HOOK_ADD_EXECS = "mountpoint awk e2fsck mke2fs" 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 d8f62bb..a6c4666 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 @@ -21,7 +21,7 @@ VERITY_BEHAVIOR_ON_CORRUPTION ?= "--restart-on-corruption" TEMPLATE_FILES += "local-top-complete.tmpl" TEMPLATE_VARS += "VERITY_BEHAVIOR_ON_CORRUPTION" -DEBIAN_DEPENDS = "initramfs-tools, cryptsetup" +DEBIAN_DEPENDS .= ", cryptsetup" DEBIAN_CONFLICTS = "initramfs-abrootfs-hook" HOOK_ADD_MODULES = "dm_mod dm_verity"