mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 18:32:12 +02:00
devtool-source.bbclass: Support kernel-fragments/patch not in SRC_URI
When using a recipe space kernel-meta, scc files are added through SRC_URI, but they may include corresponding kernel fragments or patches that are not necessarily in SRC_URI. For bitbake, this is not a problem because the kernel-yocto class adds the path where the .scc file was found to includes which consequentially makes the .cfg, .patch file available to the kernel build. However, when using devtool, only files specified in SRC_URI are copied to oe-local-files in devtool's workspace. So if the cfg/patch file is not in SRC_URI, it won't be copied, causing a kernel build failure when trying to find it. This fix parses local .scc files in SRC_URI, copies the corresponding .cfg/.patch file to devtool's workdir, and also adds it to local_files so it is available when doing a devtool build for the kernel. [YOCTO #12858] v2: also supporting patch not in SRC_URI v3: fix spacing issues (From OE-Core rev: 5dffd5403664dfcc9e8e42fd3581d5cb70823d7e) Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0472cc2368
commit
97684b24b3
@@ -90,11 +90,23 @@ python devtool_post_unpack() {
|
||||
fname in files])
|
||||
return ret
|
||||
|
||||
is_kernel_yocto = bb.data.inherits_class('kernel-yocto', d)
|
||||
# Move local source files into separate subdir
|
||||
recipe_patches = [os.path.basename(patch) for patch in
|
||||
oe.recipeutils.get_recipe_patches(d)]
|
||||
local_files = oe.recipeutils.get_recipe_local_files(d)
|
||||
|
||||
if is_kernel_yocto:
|
||||
for key in local_files.copy():
|
||||
if key.endswith('scc'):
|
||||
sccfile = open(local_files[key], 'r')
|
||||
for l in sccfile:
|
||||
line = l.split()
|
||||
if line and line[0] in ('kconf', 'patch'):
|
||||
local_files[line[-1]] = os.path.join(os.path.dirname(local_files[key]), line[-1])
|
||||
shutil.copy2(os.path.join(os.path.dirname(local_files[key]), line[-1]), workdir)
|
||||
sccfile.close()
|
||||
|
||||
# Ignore local files with subdir={BP}
|
||||
srcabspath = os.path.abspath(srcsubdir)
|
||||
local_files = [fname for fname in local_files if
|
||||
|
||||
Reference in New Issue
Block a user