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


Kristian Klausen
 

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.bbclas=
s
index 0b6d053..93f667d 100644
--- a/classes/dm-verity-img.bbclass
+++ b/classes/dm-verity-img.bbclass
@@ -67,7 +67,7 @@ VERITY_TYPES =3D "ext2.verity ext3.verity ext4.verity b=
trfs.verity"
IMAGE_TYPES +=3D "${VERITY_TYPES}"
CONVERSIONTYPES +=3D "verity"
CONVERSION_CMD:verity =3D "verity_setup ${type}"
-CONVERSION_DEPENDS:verity =3D "cryptsetup-native"
+CONVERSION_DEPENDS_verity =3D "cryptsetup-native"
=20
python __anonymous() {
verity_image =3D d.getVar('DM_VERITY_IMAGE')
--=20
2.34.1


Jose Quaresma
 



Kristian Klausen via lists.yoctoproject.org <kristian=klausen.dk@...> 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@...>
---
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






--
Best regards,

José Quaresma


Kristian Klausen
 

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



Armin Kuster
 

On 12/17/21 2:29 AM, Kristian Klausen via lists.yoctoproject.org wrote:
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
correct. The new overright syntax is now ":" instead off "_".

-armin


python __anonymous() {
verity_image = d.getVar('DM_VERITY_IMAGE')
--
2.34.1




--
Best regards,

José Quaresma