| Message ID | 20220715174611.902311-1-alhe@linux.microsoft.com |
|---|---|
| State | New |
| Headers | show |
| Series | package.bbclass: Fix kernel source handling when not using externalsrc | expand |
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 4850134022..541bb9df93 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -561,7 +561,7 @@ def copydebugsources(debugsrcdir, sources, d): # If S isnt based on WORKDIR we can infer our sources are located elsewhere, # e.g. using externalsrc; use S as base for our dirs - if workdir in sdir: + if workdir in sdir or 'work-shared' in sdir: basedir = workbasedir parentdir = workparentdir else:
Previous commit c725bdb29b266 broke kernel source handling, this was due to the code expecting the sources to be in a different directory, this did not happen when using externalsrc since sources were found in the expected directories. Pass work-shared to the check to allow sources to be found in the proper directory, allowing these to be packaged in the next step. To test this we grabbed a commit where we knew the buildpaths QA test should flag a file inside the kernel sources, with the previous commit the QA warning wasnt flagged since no sources where there, with this fix the buildpaths QA warning gets flagged properly. Signed-off-by: Alejandro Enedino Hernandez Samaniego <alhe@linux.microsoft.com> --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)