summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJaewon Lee <jaewon.lee@xilinx.com>2018-07-30 14:21:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-14 11:36:31 +0100
commitc0f9caeda5480968c5d05fdacde8f10676db5c51 (patch)
tree32fe27667707853c5b5e63d2ec30bca259818df0 /meta
parent97684b24b32584cd2dede2ce93b3d834b774d68a (diff)
downloadpoky-c0f9caeda5480968c5d05fdacde8f10676db5c51.tar.gz
kernel-yocto.bbclass: Adds oe-local-files path (devtool) to include directives
The devtool-source class moves all local files specified in SRC_URI to an oe-local-files directory. When using devtool and a recipe space kernel-meta, devtool modify throws an error because the paths the kernel-yocto class is looking for feature directories in, don't include the oe-local-files directory which devtool is using. This patch checks for feature directories in oe-local-files, and if present, adds that path to include directives. [YOCTO #12855] (From OE-Core rev: 4eceae7e3e6dab935e2cf49b75148139192fc6e7) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-yocto.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 82d80741a9..077a1ab8ef 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -140,6 +140,8 @@ do_kernel_metadata() {
140 includes="$includes -I${WORKDIR}/$f/kernel-meta" 140 includes="$includes -I${WORKDIR}/$f/kernel-meta"
141 elif [ -d "${WORKDIR}/$f" ]; then 141 elif [ -d "${WORKDIR}/$f" ]; then
142 includes="$includes -I${WORKDIR}/$f" 142 includes="$includes -I${WORKDIR}/$f"
143 elif [ -d "${WORKDIR}/../oe-local-files/$f" ]; then
144 includes="$includes -I${WORKDIR}/../oe-local-files/$f"
143 fi 145 fi
144 done 146 done
145 for s in ${sccs} ${patches}; do 147 for s in ${sccs} ${patches}; do