Re: [OE-core] [PATCH 7/7] kernel-yocto: don't apply config metadata patches twice
On Wed, Oct 6, 2021 at 8:14 AM Bruce Ashfield via lists.openembedded.org wrote: > > On Wed, Oct 6, 2021 at 5:46 AM Jose Quaresma wrote: > > > > Hi Bruce, > > > > Bruce Ashfield escreveu no dia quarta, 6/10/2021 > > à(s) 01:12: > >> > >> From: Bruce Ashfield > >> > >> Signed-off-by: Bruce Ashfield > >> --- > >> meta/classes/kernel-yocto.bbclass | 5 - > >> 1 file changed, 4 insertions(+), 1 deletion(-) > >> > >> diff --git a/meta/classes/kernel-yocto.bbclass > >> b/meta/classes/kernel-yocto.bbclass > >> index 549dfd97a4..1d5a8cdf29 100644 > >> --- a/meta/classes/kernel-yocto.bbclass > >> +++ b/meta/classes/kernel-yocto.bbclass > >> @@ -36,7 +36,10 @@ def find_patches(d,subdir): > >> if subdir == patchdir: > >> patch_list.append(local) > >> else: > >> -patch_list.append(local) > >> +# skip the patch if a patchdir was supplied, it won't be > >> handled > >> +# properly > >> +if not patchdir: > >> +patch_list.append(local) > > > > > > I think that will be useful to have a warning there when the patchdir was > > supplied > > Sure, but no one has ever hit this before in the wild, so there are > none known to be in existence, since if they did exist you'd get an > error. > Actually, as it turns out. I can't warn here (at least not in a user visible way), since it is only being skipped for a particular run of my find_sccs/patches python functions. There are other calls to those same routines that pickup patchdir/subdir patches. So when running the default collection, we can't warn, otherwise that warning is incorrect. A log might work via, since that isn't easily visible to the user and shouldn't alarm anyone. But again, I'll just carry it locally for a while longer instead. Cheers, Bruce > I'll probably just drop the patch and carry it locally. > > Bruce > > > > > Jose > > > >> > >> return patch_list > >> > >> -- > >> 2.19.1 > >> > >> > >> > >> > > > > > > -- > > Best regards, > > > > José Quaresma > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#156692): https://lists.openembedded.org/g/openembedded-core/message/156692 Mute This Topic: https://lists.openembedded.org/mt/86108495/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 7/7] kernel-yocto: don't apply config metadata patches twice
On Wed, Oct 6, 2021 at 5:46 AM Jose Quaresma wrote: > > Hi Bruce, > > Bruce Ashfield escreveu no dia quarta, 6/10/2021 > à(s) 01:12: >> >> From: Bruce Ashfield >> >> Signed-off-by: Bruce Ashfield >> --- >> meta/classes/kernel-yocto.bbclass | 5 - >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/meta/classes/kernel-yocto.bbclass >> b/meta/classes/kernel-yocto.bbclass >> index 549dfd97a4..1d5a8cdf29 100644 >> --- a/meta/classes/kernel-yocto.bbclass >> +++ b/meta/classes/kernel-yocto.bbclass >> @@ -36,7 +36,10 @@ def find_patches(d,subdir): >> if subdir == patchdir: >> patch_list.append(local) >> else: >> -patch_list.append(local) >> +# skip the patch if a patchdir was supplied, it won't be handled >> +# properly >> +if not patchdir: >> +patch_list.append(local) > > > I think that will be useful to have a warning there when the patchdir was > supplied Sure, but no one has ever hit this before in the wild, so there are none known to be in existence, since if they did exist you'd get an error. I'll probably just drop the patch and carry it locally. Bruce > > Jose > >> >> return patch_list >> >> -- >> 2.19.1 >> >> >> >> > > > -- > Best regards, > > José Quaresma -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#156689): https://lists.openembedded.org/g/openembedded-core/message/156689 Mute This Topic: https://lists.openembedded.org/mt/86108495/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 7/7] kernel-yocto: don't apply config metadata patches twice
Hi Bruce, Bruce Ashfield escreveu no dia quarta, 6/10/2021 à(s) 01:12: > From: Bruce Ashfield > > Signed-off-by: Bruce Ashfield > --- > meta/classes/kernel-yocto.bbclass | 5 - > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta/classes/kernel-yocto.bbclass > b/meta/classes/kernel-yocto.bbclass > index 549dfd97a4..1d5a8cdf29 100644 > --- a/meta/classes/kernel-yocto.bbclass > +++ b/meta/classes/kernel-yocto.bbclass > @@ -36,7 +36,10 @@ def find_patches(d,subdir): > if subdir == patchdir: > patch_list.append(local) > else: > -patch_list.append(local) > +# skip the patch if a patchdir was supplied, it won't be > handled > +# properly > +if not patchdir: > +patch_list.append(local) > I think that will be useful to have a warning there when the patchdir was supplied Jose > return patch_list > > -- > 2.19.1 > > > > > -- Best regards, José Quaresma -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#156676): https://lists.openembedded.org/g/openembedded-core/message/156676 Mute This Topic: https://lists.openembedded.org/mt/86108495/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 7/7] kernel-yocto: don't apply config metadata patches twice
From: Bruce Ashfield Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 549dfd97a4..1d5a8cdf29 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -36,7 +36,10 @@ def find_patches(d,subdir): if subdir == patchdir: patch_list.append(local) else: -patch_list.append(local) +# skip the patch if a patchdir was supplied, it won't be handled +# properly +if not patchdir: +patch_list.append(local) return patch_list -- 2.19.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#156667): https://lists.openembedded.org/g/openembedded-core/message/156667 Mute This Topic: https://lists.openembedded.org/mt/86108495/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
