From e46cc8159136ce96489e10f126405781abfbd52e Mon Sep 17 00:00:00 2001 From: Christian Taedcke Date: Fri, 20 Dec 2024 16:30:04 +0100 Subject: [PATCH] kernel-yocto: enable fetching kernel metadata using file fetcher If no destsuffix parameter is supplied and the file fetcher is used, the folder name (i.e. basepath) is added to the kernel-meta search directories. Signed-off-by: Christian Taedcke Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/classes-recipe/kernel-yocto.bbclass | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass index a5d89dc2c8b..7d80e9aa527 100644 --- a/meta/classes-recipe/kernel-yocto.bbclass +++ b/meta/classes-recipe/kernel-yocto.bbclass @@ -62,8 +62,8 @@ def find_sccs(d): return sources_list -# check the SRC_URI for "kmeta" type'd git repositories. Return the name of -# the repository as it will be found in UNPACKDIR +# check the SRC_URI for "kmeta" type'd git repositories and directories. Return +# the name of the repository or directory as it will be found in UNPACKDIR def find_kernel_feature_dirs(d): feature_dirs=[] fetch = bb.fetch2.Fetch([], d) @@ -71,13 +71,16 @@ def find_kernel_feature_dirs(d): urldata = fetch.ud[url] parm = urldata.parm type="" + destdir = "" if "type" in parm: type = parm["type"] if "destsuffix" in parm: destdir = parm["destsuffix"] - if type == "kmeta": - feature_dirs.append(destdir) - + elif urldata.type == "file": + destdir = urldata.basepath + if type == "kmeta" and destdir: + feature_dirs.append(destdir) + return feature_dirs # find the master/machine source branch. In the same way that the fetcher proceses -- 2.47.3