diff mbox series

[2/3] archiver.bbclass: avoid kernel rebuilds caused by the do_unpack_and_patch

Message ID 20220722123124.390710-2-jose.quaresma@foundries.io
State New
Headers show
Series [1/3] archiver.bbclass: remove unsed do_deploy_archives[dirs] | expand

Commit Message

Jose Quaresma July 22, 2022, 12:31 p.m. UTC
The commit b8c5680 [1] add the funcion is_work_shared and at the same
time change from kernel-yocto.bbclass to a more generic kernel.bbclass.

This is also a fixup for the commit fed0ed8 [2] to avoid kernel rebuilds
because of the do_kernel_configme->do_unpack_and_patch task dependency.

[1] https://git.openembedded.org/openembedded-core/commit/?id=b8c5680a67888d43540366a40bd0c501e926ac31
[2] https://git.openembedded.org/openembedded-core/commit/?id=fed0ed82928e6a7846fbad233ac657bd17bcefc7

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 meta/classes/archiver.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Richard Purdie July 24, 2022, 9:53 a.m. UTC | #1
On Fri, 2022-07-22 at 13:31 +0100, Jose Quaresma wrote:
> The commit b8c5680 [1] add the funcion is_work_shared and at the same
> time change from kernel-yocto.bbclass to a more generic kernel.bbclass.
> 
> This is also a fixup for the commit fed0ed8 [2] to avoid kernel rebuilds
> because of the do_kernel_configme->do_unpack_and_patch task dependency.
> 
> [1] https://git.openembedded.org/openembedded-core/commit/?id=b8c5680a67888d43540366a40bd0c501e926ac31
> [2] https://git.openembedded.org/openembedded-core/commit/?id=fed0ed82928e6a7846fbad233ac657bd17bcefc7
> 
> Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> ---
>  meta/classes/archiver.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
> index 5da369d422..9c605cc932 100644
> --- a/meta/classes/archiver.bbclass
> +++ b/meta/classes/archiver.bbclass
> @@ -610,6 +610,6 @@ python () {
>      # sstatesig.py:sstate_rundepfilter has special support that excludes this dependency
>      # so that do_kernel_configme does not need to run again when do_unpack_and_patch
>      # gets added or removed (by adding or removing archiver.bbclass).
> -    if bb.data.inherits_class('kernel-yocto', d):
> +    if bb.data.inherits_class('kernel', d):
>          bb.build.addtask('do_kernel_configme', 'do_configure', 'do_unpack_and_patch', d)
>  }

This doesn't look right since do_kernel_configme is only available in
kernel-yocto.bbclass, not from kernel.bbclass?

Cheers,

Richard
Jose Quaresma July 25, 2022, 9 a.m. UTC | #2
Richard Purdie <richard.purdie@linuxfoundation.org> escreveu no dia
domingo, 24/07/2022 à(s) 10:53:

> On Fri, 2022-07-22 at 13:31 +0100, Jose Quaresma wrote:
> > The commit b8c5680 [1] add the funcion is_work_shared and at the same
> > time change from kernel-yocto.bbclass to a more generic kernel.bbclass.
> >
> > This is also a fixup for the commit fed0ed8 [2] to avoid kernel rebuilds
> > because of the do_kernel_configme->do_unpack_and_patch task dependency.
> >
> > [1]
> https://git.openembedded.org/openembedded-core/commit/?id=b8c5680a67888d43540366a40bd0c501e926ac31
> > [2]
> https://git.openembedded.org/openembedded-core/commit/?id=fed0ed82928e6a7846fbad233ac657bd17bcefc7
> >
> > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> > ---
> >  meta/classes/archiver.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/archiver.bbclass
> b/meta/classes/archiver.bbclass
> > index 5da369d422..9c605cc932 100644
> > --- a/meta/classes/archiver.bbclass
> > +++ b/meta/classes/archiver.bbclass
> > @@ -610,6 +610,6 @@ python () {
> >      # sstatesig.py:sstate_rundepfilter has special support that
> excludes this dependency
> >      # so that do_kernel_configme does not need to run again when
> do_unpack_and_patch
> >      # gets added or removed (by adding or removing archiver.bbclass).
> > -    if bb.data.inherits_class('kernel-yocto', d):
> > +    if bb.data.inherits_class('kernel', d):
> >          bb.build.addtask('do_kernel_configme', 'do_configure',
> 'do_unpack_and_patch', d)
> >  }
>
> This doesn't look right since do_kernel_configme is only available in
> kernel-yocto.bbclass, not from kernel.bbclass?
>

Right, thanks for reviewing and sorry for that. Please drop this patch.

I don't even know how I got here because in fact we use
kernel-yocto.bbclass in our kernel,
when debugging the patch 3/3 and during blaming I made some confusion and
concluded it wrongly.

Jose


>
> Cheers,
>
> Richard
>
diff mbox series

Patch

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 5da369d422..9c605cc932 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -610,6 +610,6 @@  python () {
     # sstatesig.py:sstate_rundepfilter has special support that excludes this dependency
     # so that do_kernel_configme does not need to run again when do_unpack_and_patch
     # gets added or removed (by adding or removing archiver.bbclass).
-    if bb.data.inherits_class('kernel-yocto', d):
+    if bb.data.inherits_class('kernel', d):
         bb.build.addtask('do_kernel_configme', 'do_configure', 'do_unpack_and_patch', d)
 }