diff mbox series

[10/11] sstatesig: Handle special case of llvm-project-source shared-workdir

Message ID 20250424-clang-merge-v1-10-5a492a8461aa@gmail.com
State New
Headers show
Series clang-merge: Bring clang recipes from meta-clang | expand

Commit Message

Khem Raj April 24, 2025, 7:20 a.m. UTC
bitbake-dumpsig or bitbake-diffsig tools do not work on any of tasks
exposed by llvm-project-source recipe. This is due to it being a
shared-workdir recipe.

Fixes

bitbake-diffsigs -t llvm-project-source-20.1.2 do_preconfigure
NOTE: Starting bitbake server...
ERROR: No sigdata files found matching llvm-project-source-20.1.2 do_preconfigure

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/lib/oe/sstatesig.py | 3 +++
 1 file changed, 3 insertions(+)

Comments

Dmitry Baryshkov April 24, 2025, 9:11 a.m. UTC | #1
On Thu, Apr 24, 2025 at 12:20:44AM -0700, Khem Raj wrote:
> bitbake-dumpsig or bitbake-diffsig tools do not work on any of tasks
> exposed by llvm-project-source recipe. This is due to it being a
> shared-workdir recipe.
> 
> Fixes
> 
> bitbake-diffsigs -t llvm-project-source-20.1.2 do_preconfigure
> NOTE: Starting bitbake server...
> ERROR: No sigdata files found matching llvm-project-source-20.1.2 do_preconfigure

If anybody runs git bisect on top of OE-Core, they might face issues if
this patch (and the next one) come after actual clang recipe. I think it
makes sense to rearrange them to come before the clang recipe
introduction, so that at each stage the tree can be built without
issues.

> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/lib/oe/sstatesig.py | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
> index 1f976067631f80d637ba803f49813323d17e7c70..826549948e24571ef57acbe6bc5a2442d6c49f13 100644
> --- a/meta/lib/oe/sstatesig.py
> +++ b/meta/lib/oe/sstatesig.py
> @@ -418,6 +418,9 @@ def find_siginfo(pn, taskname, taskhashlist, d):
>      if pn.startswith("gcc-source"):
>          # gcc-source shared workdir is a special case :(
>          stamp = localdata.expand("${STAMPS_DIR}/work-shared/gcc-${PV}-${PR}")
> +    elif pn.startswith("llvm-project-source"):
> +        # llvm-project-source shared workdir is also a special case :*(
> +        stamp = localdata.expand("${STAMPS_DIR}/work-shared/llvm-project-source-${PV}-${PR}")
>  
>      filespec = '%s.%s.sigdata.*' % (stamp, taskname)
>      foundall = False
> 
> -- 
> 2.49.0
> 
>
Khem Raj April 24, 2025, 6:21 p.m. UTC | #2
On Thu, Apr 24, 2025 at 2:12 AM Dmitry Baryshkov
<dmitry.baryshkov@oss.qualcomm.com> wrote:
>
> On Thu, Apr 24, 2025 at 12:20:44AM -0700, Khem Raj wrote:
> > bitbake-dumpsig or bitbake-diffsig tools do not work on any of tasks
> > exposed by llvm-project-source recipe. This is due to it being a
> > shared-workdir recipe.
> >
> > Fixes
> >
> > bitbake-diffsigs -t llvm-project-source-20.1.2 do_preconfigure
> > NOTE: Starting bitbake server...
> > ERROR: No sigdata files found matching llvm-project-source-20.1.2 do_preconfigure
>
> If anybody runs git bisect on top of OE-Core, they might face issues if
> this patch (and the next one) come after actual clang recipe. I think it
> makes sense to rearrange them to come before the clang recipe
> introduction, so that at each stage the tree can be built without
> issues.

Makes sense will rearrange in v2

>
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  meta/lib/oe/sstatesig.py | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
> > index 1f976067631f80d637ba803f49813323d17e7c70..826549948e24571ef57acbe6bc5a2442d6c49f13 100644
> > --- a/meta/lib/oe/sstatesig.py
> > +++ b/meta/lib/oe/sstatesig.py
> > @@ -418,6 +418,9 @@ def find_siginfo(pn, taskname, taskhashlist, d):
> >      if pn.startswith("gcc-source"):
> >          # gcc-source shared workdir is a special case :(
> >          stamp = localdata.expand("${STAMPS_DIR}/work-shared/gcc-${PV}-${PR}")
> > +    elif pn.startswith("llvm-project-source"):
> > +        # llvm-project-source shared workdir is also a special case :*(
> > +        stamp = localdata.expand("${STAMPS_DIR}/work-shared/llvm-project-source-${PV}-${PR}")
> >
> >      filespec = '%s.%s.sigdata.*' % (stamp, taskname)
> >      foundall = False
> >
> > --
> > 2.49.0
> >
> >
>
> --
> With best wishes
> Dmitry
diff mbox series

Patch

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 1f976067631f80d637ba803f49813323d17e7c70..826549948e24571ef57acbe6bc5a2442d6c49f13 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -418,6 +418,9 @@  def find_siginfo(pn, taskname, taskhashlist, d):
     if pn.startswith("gcc-source"):
         # gcc-source shared workdir is a special case :(
         stamp = localdata.expand("${STAMPS_DIR}/work-shared/gcc-${PV}-${PR}")
+    elif pn.startswith("llvm-project-source"):
+        # llvm-project-source shared workdir is also a special case :*(
+        stamp = localdata.expand("${STAMPS_DIR}/work-shared/llvm-project-source-${PV}-${PR}")
 
     filespec = '%s.%s.sigdata.*' % (stamp, taskname)
     foundall = False