summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Hernandez Samaniego <alhe@linux.microsoft.com>2022-07-15 11:46:11 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-16 07:40:30 +0100
commit2714a8ef8c7b3c66d50f27f4f52fe2fe4db39b00 (patch)
tree616e5b08c99cc8949ebb4f3f6dcf625ff5a82302
parent38d3df4b83c90bba903574c50599344c8347d0e3 (diff)
downloadopenembedded-core-contrib-2714a8ef8c7b3c66d50f27f4f52fe2fe4db39b00.tar.gz
package.bbclass: Fix kernel source handling when not using externalsrc
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 63887b34f8..97e97d2703 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -566,7 +566,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: