diff mbox series

[meta-security] dm-verity: set staging correctly in case basename has changed

Message ID 20240520193347.2271954-1-louis.rannou@syslinbit.com
State New
Headers show
Series [meta-security] dm-verity: set staging correctly in case basename has changed | expand

Commit Message

Louis Rannou May 20, 2024, 7:33 p.m. UTC
From: Louis Rannou <louis.rannou@non.se.com>

Fix the verity class when the IMAGE_BASENAME has changed. Prefer DM_VERITY_IMAGE
for staging env and wic fragment so it matchs what is used in the
dm-verity-image-initramfs and the base wks systemd-bootdisk-dmverity.wks.in.

Signed-off-by: Louis Rannou <louis.rannou@non.se.com>
Signed-off-by: Louis Rannou <louis.rannou@syslinbit.com>
---
 classes/dm-verity-img.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Louis Rannou Oct. 29, 2024, 9:33 p.m. UTC | #1
Hello,

Could you consider this patch which fix an issue in dm-verity ? Can I do 
anything for help ?

Regards,
Louis

On 20/05/2024 21:33, Louis Rannou wrote:
> From: Louis Rannou <louis.rannou@non.se.com>
> 
> Fix the verity class when the IMAGE_BASENAME has changed. Prefer DM_VERITY_IMAGE
> for staging env and wic fragment so it matchs what is used in the
> dm-verity-image-initramfs and the base wks systemd-bootdisk-dmverity.wks.in.
> 
> Signed-off-by: Louis Rannou <louis.rannou@non.se.com>
> Signed-off-by: Louis Rannou <louis.rannou@syslinbit.com>
> ---
>   classes/dm-verity-img.bbclass | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass
> index 7f79548..1a34b4e 100644
> --- a/classes/dm-verity-img.bbclass
> +++ b/classes/dm-verity-img.bbclass
> @@ -60,8 +60,8 @@ DEPENDS += "bc-native"
>   # convert it to some better format. Let's drop the first line (doesn't contain
>   # any useful info) and feed the rest to a script.
>   process_verity() {
> -    local ENV="${STAGING_VERITY_DIR}/${IMAGE_BASENAME}.$TYPE.verity.env"
> -    local WKS_INC="${STAGING_VERITY_DIR}/${IMAGE_BASENAME}.$TYPE.wks.in"
> +    local ENV="${STAGING_VERITY_DIR}/${DM_VERITY_IMAGE}.$TYPE.verity.env"
> +    local WKS_INC="${STAGING_VERITY_DIR}/${DM_VERITY_IMAGE}.$TYPE.wks.in"
>       rm -f $ENV
>   
>       # Each line contains a key and a value string delimited by ':'. Read the
diff mbox series

Patch

diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass
index 7f79548..1a34b4e 100644
--- a/classes/dm-verity-img.bbclass
+++ b/classes/dm-verity-img.bbclass
@@ -60,8 +60,8 @@  DEPENDS += "bc-native"
 # convert it to some better format. Let's drop the first line (doesn't contain
 # any useful info) and feed the rest to a script.
 process_verity() {
-    local ENV="${STAGING_VERITY_DIR}/${IMAGE_BASENAME}.$TYPE.verity.env"
-    local WKS_INC="${STAGING_VERITY_DIR}/${IMAGE_BASENAME}.$TYPE.wks.in"
+    local ENV="${STAGING_VERITY_DIR}/${DM_VERITY_IMAGE}.$TYPE.verity.env"
+    local WKS_INC="${STAGING_VERITY_DIR}/${DM_VERITY_IMAGE}.$TYPE.wks.in"
     rm -f $ENV
 
     # Each line contains a key and a value string delimited by ':'. Read the