From 4fd8f9b863ffa98feb48ceb63691781240099754 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Samaniego Date: Fri, 15 Jul 2022 11:46:11 -0600 Subject: [PATCH] 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 Signed-off-by: Richard Purdie (cherry picked from commit 2714a8ef8c7b3c66d50f27f4f52fe2fe4db39b00) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: