Skip to contentSkip to conversation

license_image.bbclass: Make QA errors fail the build

PATCH In review Peter Kjellerstedt 3 participants 5 messages Apr 22, 2022 – May 23, 2022 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 license_image.bbclass: Make QA errors fail the build

If, e.g., license-file-missing is added to ERROR_QA, then the build should fail if any licenses are missing.

---
 meta/classes/license_image.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/license_image.bbclass +2 -0
index 7e1d0e08a9..3213ea758e 100644
@@ -104,6 +104,8 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True):
                                        "The license listed %s was not in the "\
                                        "licenses collected for recipe %s"
                                        % (lic, pkg_dic[pkg]["PN"]), d)
+    oe.qa.exit_if_errors(d)
+
     # Two options here:
     # - Just copy the manifest
     # - Copy the manifest and the license directories
#1 lore raw

I haven't seen this patch hit master or master-next yet. Were there issues with it?

Just want to make sure I don't miss anything requested for kirkstone.

Steve

Quoted 31 lines · Peter Kjellerstedt

If, e.g., license-file-missing is added to ERROR_QA, then the build should fail if any licenses are missing.

---
 meta/classes/license_image.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/license_image.bbclass +2 -1
index 7e1d0e08a9..3213ea758e 100644
@@ -104,6 +104,8 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True):
                                        "The license listed %s was not in the "\
                                        "licenses collected for recipe %s"
                                        % (lic, pkg_dic[pkg]["PN"]), d)
+    oe.qa.exit_if_errors(d)
+
     # Two options here:
     # - Just copy the manifest
     # - Copy the manifest and the license directories
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#164766): https://lists.openembedded.org/g/openembedded-core/message/164766
Mute This Topic: https://lists.openembedded.org/mt/90615582/3617601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw
Quoted 9 lines

-----Original Message-----
From: Steve Sakoman <[email protected]>
Sent: den 28 april 2022 19:36
To: Peter Kjellerstedt <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>
Subject: Re: [OE-core] [master][kirkstone][PATCH] license_image.bbclass:
Make QA errors fail the build

Quoted 6 lines

I haven't seen this patch hit master or master-next yet. Were there issues with it?

Just want to make sure I don't miss anything requested for kirkstone.

Steve

It is in master-next now so I assume it will make it to master soon.

//Peter

Quoted 40 lines

Review

Quoted 10 lines · Peter Kjellerstedt

If, e.g., license-file-missing is added to ERROR_QA, then the build should fail if any licenses are missing.

---
 meta/classes/license_image.bbclass | 2 ++
 1 file changed, 2 insertions(+)
(quoted diff) +0 -0

b/meta/classes/license_image.bbclass

meta/classes/license_image.bbclass def write_license_files(d, license_manifest,

Quoted 4 lines

index 7e1d0e08a9..3213ea758e 100644

meta/classes/license_image.bbclass +0 -0
@@ -104,6 +104,8 @@ def write_license_files(d, license_manifest,

pkg_dic, rootfs=True):

meta/classes/license_image.bbclass def write_license_files(d, license_manifest, · line 104

Quoted 1 line
meta/classes/license_image.bbclass +0 -0
                                        "The license listed %s was not

in the "\

meta/classes/license_image.bbclass def write_license_files(d, license_manifest, · line 105

Quoted 1 line
meta/classes/license_image.bbclass +0 -0
                                        "licenses collected for recipe

%s"

Quoted 10 lines
meta/classes/license_image.bbclass +2 -1
                                        % (lic, pkg_dic[pkg]["PN"]), d)
+    oe.qa.exit_if_errors(d)
+
     # Two options here:
     # - Just copy the manifest
     # - Copy the manifest and the license directories
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group. View/Reply Online (#164766):

https://lists.openembedded.org/g/openembedded-core/message/164766

Quoted 3 lines

Mute This Topic: https://lists.openembedded.org/mt/90615582/3617601
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub

[[email protected]]

Quoted 2 lines

-=-=-=-=-=-=-=-=-=-=-=-

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw
Quoted 22 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 29 april 2022 10:10
To: Steve Sakoman <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>
Subject: Re: [OE-core] [master][kirkstone][PATCH] license_image.bbclass:
Make QA errors fail the build

Quoted 12 lines

-----Original Message-----
From: Steve Sakoman <[email protected]>
Sent: den 28 april 2022 19:36
To: Peter Kjellerstedt <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>
Subject: Re: [OE-core] [master][kirkstone][PATCH] license_image.bbclass:
Make QA errors fail the build

I haven't seen this patch hit master or master-next yet. Were there issues with it?

Quoted 7 lines
Quoted 3 lines

Just want to make sure I don't miss anything requested for kirkstone.

Steve

It is in master-next now so I assume it will make it to master soon.

//Peter

I guess you missed it since it didn't make 4.0.1... ;)

//Peter

Quoted 23 lines
Quoted 23 lines · Peter Kjellerstedt
Quoted 22 lines

If, e.g., license-file-missing is added to ERROR_QA, then the build should fail if any licenses are missing.

---
 meta/classes/license_image.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/license_image.bbclass +2 -0
index 7e1d0e08a9..3213ea758e 100644
@@ -104,6 +104,8 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True):
                                        "The license listed %s was not in the "\
                                        "licenses collected for recipe %s"
                                        % (lic, pkg_dic[pkg]["PN"]), d)
+    oe.qa.exit_if_errors(d)
+
     # Two options here:
     # - Just copy the manifest
     # - Copy the manifest and the license directories
#5 lore raw
Quoted 25 lines · Peter Kjellerstedt
Quoted 25 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 29 april 2022 10:10
To: Steve Sakoman <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>
Subject: Re: [OE-core] [master][kirkstone][PATCH] license_image.bbclass:
Make QA errors fail the build

Quoted 14 lines

-----Original Message-----
From: Steve Sakoman <[email protected]>
Sent: den 28 april 2022 19:36
To: Peter Kjellerstedt <[email protected]>
Cc: Patches and discussions about the oe-core layer <openembedded- [email protected]>
Subject: Re: [OE-core] [master][kirkstone][PATCH] license_image.bbclass:
Make QA errors fail the build

I haven't seen this patch hit master or master-next yet. Were there issues with it?

Just want to make sure I don't miss anything requested for kirkstone.

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Steve

It is in master-next now so I assume it will make it to master soon.

//Peter

I guess you missed it since it didn't make 4.0.1... ;)

I've got it now! Thanks for the reminder.

Steve