| Message ID | 20220421211146.19368-1-pkj@axis.com |
|---|---|
| State | Accepted, archived |
| Commit | dd91c4bec8335cab2bbd0b33caf50d314ca72bdc |
| Headers | show |
| Series | [master,kirkstone] license_image.bbclass: Make QA errors fail the build | expand |
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 On Thu, Apr 21, 2022 at 11:11 AM Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote: > > If, e.g., license-file-missing is added to ERROR_QA, then the build > should fail if any licenses are missing. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > --- > meta/classes/license_image.bbclass | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass > index 7e1d0e08a9..3213ea758e 100644 > --- a/meta/classes/license_image.bbclass > +++ b/meta/classes/license_image.bbclass > @@ -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: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [sakoman@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
> -----Original Message----- > From: Steve Sakoman <steve@sakoman.com> > Sent: den 28 april 2022 19:36 > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > Cc: Patches and discussions about the oe-core layer <openembedded- > core@lists.openembedded.org> > 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. > > Steve It is in master-next now so I assume it will make it to master soon. //Peter > > On Thu, Apr 21, 2022 at 11:11 AM Peter Kjellerstedt > <peter.kjellerstedt@axis.com> wrote: > > > > If, e.g., license-file-missing is added to ERROR_QA, then the build > > should fail if any licenses are missing. > > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > > --- > > meta/classes/license_image.bbclass | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/meta/classes/license_image.bbclass > b/meta/classes/license_image.bbclass > > index 7e1d0e08a9..3213ea758e 100644 > > --- a/meta/classes/license_image.bbclass > > +++ b/meta/classes/license_image.bbclass > > @@ -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: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub > [sakoman@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > >
> -----Original Message----- > From: openembedded-core@lists.openembedded.org <openembedded- > core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > Sent: den 29 april 2022 10:10 > To: Steve Sakoman <steve@sakoman.com> > Cc: Patches and discussions about the oe-core layer <openembedded- > core@lists.openembedded.org> > Subject: Re: [OE-core] [master][kirkstone][PATCH] license_image.bbclass: > Make QA errors fail the build > > > -----Original Message----- > > From: Steve Sakoman <steve@sakoman.com> > > Sent: den 28 april 2022 19:36 > > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > > Cc: Patches and discussions about the oe-core layer <openembedded- > > core@lists.openembedded.org> > > 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. > > > > 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 > > On Thu, Apr 21, 2022 at 11:11 AM Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote: > > > > > > If, e.g., license-file-missing is added to ERROR_QA, then the build > > > should fail if any licenses are missing. > > > > > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > > > --- > > > meta/classes/license_image.bbclass | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass > > > index 7e1d0e08a9..3213ea758e 100644 > > > --- a/meta/classes/license_image.bbclass > > > +++ b/meta/classes/license_image.bbclass > > > @@ -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
On Mon, May 23, 2022 at 11:57 AM Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote: > > > -----Original Message----- > > From: openembedded-core@lists.openembedded.org <openembedded- > > core@lists.openembedded.org> On Behalf Of Peter Kjellerstedt > > Sent: den 29 april 2022 10:10 > > To: Steve Sakoman <steve@sakoman.com> > > Cc: Patches and discussions about the oe-core layer <openembedded- > > core@lists.openembedded.org> > > Subject: Re: [OE-core] [master][kirkstone][PATCH] license_image.bbclass: > > Make QA errors fail the build > > > > > -----Original Message----- > > > From: Steve Sakoman <steve@sakoman.com> > > > Sent: den 28 april 2022 19:36 > > > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > > > Cc: Patches and discussions about the oe-core layer <openembedded- > > > core@lists.openembedded.org> > > > 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. > > > > > > 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
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 7e1d0e08a9..3213ea758e 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -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
If, e.g., license-file-missing is added to ERROR_QA, then the build should fail if any licenses are missing. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> --- meta/classes/license_image.bbclass | 2 ++ 1 file changed, 2 insertions(+)