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-25 15:11:46 +0100
commit4fd8f9b863ffa98feb48ceb63691781240099754 (patch)
tree229a21ffcf72501e4c994dc2bcd4007fbc1b49be
parentf1d0a3c7c6c6f1a2f077fb3ad14c30379cc11865 (diff)
downloadpoky-4fd8f9b863ffa98feb48ceb63691781240099754.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. (From OE-Core rev: 8efd5e31670235f7c59af2a5ee14646f029f4d18) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alhe@linux.microsoft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2714a8ef8c7b3c66d50f27f4f52fe2fe4db39b00) Signed-off-by: Steve Sakoman <steve@sakoman.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):
566 566
567 # If S isnt based on WORKDIR we can infer our sources are located elsewhere, 567 # If S isnt based on WORKDIR we can infer our sources are located elsewhere,
568 # e.g. using externalsrc; use S as base for our dirs 568 # e.g. using externalsrc; use S as base for our dirs
569 if workdir in sdir: 569 if workdir in sdir or 'work-shared' in sdir:
570 basedir = workbasedir 570 basedir = workbasedir
571 parentdir = workparentdir 571 parentdir = workparentdir
572 else: 572 else: