Skip to contentSkip to conversation

package.bbclass: Fix kernel source handling when not using externalsrc

PATCH New Alejandro Enedino Hernandez Samaniego 1 participant 1 message Jul 15, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/package.bbclass +1 -1
index 4850134022..541bb9df93 100644
@@ -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:
Signature · 1 line
2.25.1