diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-09-07 21:08:45 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-08 08:25:03 +0100 |
| commit | 7ef7af5c03bad28faf380986f792f7f3d4d5944d (patch) | |
| tree | be1af8f2822b7204dd3d58470b8e036249257bf6 | |
| parent | cbebc9a2edf7d7a422ee5c71219e79e3b349de3b (diff) | |
| download | openembedded-core-contrib-7ef7af5c03bad28faf380986f792f7f3d4d5944d.tar.gz | |
kernel-yocto: restore kernel-meta data detection for SRC_URI elements
Before the kernel tools were simplified and streamlined, there was code
which not only migrated a patch/cfg/scc to the kernel build tree, it
also migrated any subdirectories of those patches.
The effect of this data migration was that any other meta data in
a patch's directory structure would be available for processing.
While we don't want to do this migration anymore, it is possible to
check the path of any SRC_URI patches, and if they include a "kernel-meta"
subdirectory add it to the search path.
This restores the functionality without the old complexity.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 068378f067..f991f0219b 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -124,14 +124,19 @@ do_kernel_metadata() { # for the update part of the process for f in ${feat_dirs}; do if [ -d "${WORKDIR}/$f/meta" ]; then - includes="$includes -I${WORKDIR}/$f/meta" - elif [ -d "${WORKDIR}/$f" ]; then + includes="$includes -I${WORKDIR}/$f/kernel-meta" + elif [ -d "${WORKDIR}/$f" ]; then includes="$includes -I${WORKDIR}/$f" fi done - for s in ${sccs}; do + for s in ${sccs} ${patches}; do sdir=$(dirname $s) includes="$includes -I${sdir}" + # if a SRC_URI passed patch or .scc has a subdir of "kernel-meta", + # then we add it to the search path + if [ -d "${sdir}/kernel-meta" ]; then + includes="$includes -I${sdir}/kernel-meta" + fi done # expand kernel features into their full path equivalents |