[meta-security] dm-verity-img.bbclass: Fix wrong override syntax for CONVERSION_DEPENDS

Message ID 20211217095543.202026-1-kristian@klausen.dk
State New
Headers show
Series [meta-security] dm-verity-img.bbclass: Fix wrong override syntax for CONVERSION_DEPENDS | expand

Commit Message

Kristian Klausen Dec. 17, 2021, 9:55 a.m. UTC
CONVERSION_DEPENDS hasn't been converted to the new syntax.

Fixes: a23ceef ("dm-verity-img.bbclass: more overided fixups")

Signed-off-by: Kristian Klausen <kristian@klausen.dk>
---
This should also be backported to honister.

 classes/dm-verity-img.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jose Quaresma Dec. 17, 2021, 10:06 a.m. UTC | #1
Kristian Klausen via lists.yoctoproject.org <kristian=
klausen.dk@lists.yoctoproject.org> escreveu no dia sexta, 17/12/2021 à(s)
09:55:

> CONVERSION_DEPENDS hasn't been converted to the new syntax.
>
> Fixes: a23ceef ("dm-verity-img.bbclass: more overided fixups")
>
> Signed-off-by: Kristian Klausen <kristian@klausen.dk>
> ---
> This should also be backported to honister.
>
>  classes/dm-verity-img.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass
> index 0b6d053..93f667d 100644
> --- a/classes/dm-verity-img.bbclass
> +++ b/classes/dm-verity-img.bbclass
> @@ -67,7 +67,7 @@ VERITY_TYPES = "ext2.verity ext3.verity ext4.verity
> btrfs.verity"
>  IMAGE_TYPES += "${VERITY_TYPES}"
>  CONVERSIONTYPES += "verity"
>  CONVERSION_CMD:verity = "verity_setup ${type}"
> -CONVERSION_DEPENDS:verity = "cryptsetup-native"
> +CONVERSION_DEPENDS_verity = "cryptsetup-native"
>

This syntax don't work anymore with oe-core master branch


>  python __anonymous() {
>      verity_image = d.getVar('DM_VERITY_IMAGE')
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#55605):
> https://lists.yoctoproject.org/g/yocto/message/55605
> Mute This Topic: https://lists.yoctoproject.org/mt/87786381/5052612
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Kristian Klausen Dec. 17, 2021, 10:29 a.m. UTC | #2
On Fri, Dec 17, 2021 at 10:06:06 +0000, Jose Quaresma wrote:
> Kristian Klausen via lists.yoctoproject.org <kristian=
> klausen.dk@lists.yoctoproject.org> escreveu no dia sexta, 17/12/2021 à(s)
> 09:55:
> 
> > CONVERSION_DEPENDS hasn't been converted to the new syntax.
> >
> > Fixes: a23ceef ("dm-verity-img.bbclass: more overided fixups")
> >
> > Signed-off-by: Kristian Klausen <kristian@klausen.dk>
> > ---
> > This should also be backported to honister.
> >
> >  classes/dm-verity-img.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass
> > index 0b6d053..93f667d 100644
> > --- a/classes/dm-verity-img.bbclass
> > +++ b/classes/dm-verity-img.bbclass
> > @@ -67,7 +67,7 @@ VERITY_TYPES = "ext2.verity ext3.verity ext4.verity
> > btrfs.verity"
> >  IMAGE_TYPES += "${VERITY_TYPES}"
> >  CONVERSIONTYPES += "verity"
> >  CONVERSION_CMD:verity = "verity_setup ${type}"
> > -CONVERSION_DEPENDS:verity = "cryptsetup-native"
> > +CONVERSION_DEPENDS_verity = "cryptsetup-native"
> >
> 
> This syntax don't work anymore with oe-core master branch

(resend as I forgot to CC the list)

Are you sure? This was tested with the honister branch, but the code is 
the same[1].

[1] https://git.openembedded.org/openembedded-core/tree/meta/classes/image_types.bbclass#n40

> 
> 
> >  python __anonymous() {
> >      verity_image = d.getVar('DM_VERITY_IMAGE')
> > --
> > 2.34.1
> >
> >
> > 
> >
> >
> 
> -- 
> Best regards,
> 
> José Quaresma

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#55606): https://lists.yoctoproject.org/g/yocto/message/55606
> Mute This Topic: https://lists.yoctoproject.org/mt/87786381/6376886
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [kristian@klausen.dk]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Patch

diff --git a/classes/dm-verity-img.bbclass b/classes/dm-verity-img.bbclass
index 0b6d053..93f667d 100644
--- a/classes/dm-verity-img.bbclass
+++ b/classes/dm-verity-img.bbclass
@@ -67,7 +67,7 @@  VERITY_TYPES = "ext2.verity ext3.verity ext4.verity btrfs.verity"
 IMAGE_TYPES += "${VERITY_TYPES}"
 CONVERSIONTYPES += "verity"
 CONVERSION_CMD:verity = "verity_setup ${type}"
-CONVERSION_DEPENDS:verity = "cryptsetup-native"
+CONVERSION_DEPENDS_verity = "cryptsetup-native"
 
 python __anonymous() {
     verity_image = d.getVar('DM_VERITY_IMAGE')