From: Alejandro Hernandez Samaniego Date: Fri, 15 Jul 2022 17:46:11 +0000 (-0600) Subject: package.bbclass: Fix kernel source handling when not using externalsrc X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3584 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2714a8ef8c7b3c66d50f27f4f52fe2fe4db39b00;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 63887b34f83..97e97d2703b 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: