summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-10-05 20:12:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-07 15:06:01 +0100
commit0b88ed0af350c609ce8075e7d89ca7db91486858 (patch)
tree580e86e9a76114a9dc9a332124464ac3122585fb
parent9e0a213388be5d758e5e043386af3d7c7e535fe4 (diff)
downloadopenembedded-core-0b88ed0af350c609ce8075e7d89ca7db91486858.tar.gz
kernel-yocto: don't apply config metadata patches twice
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 549dfd97a4..1d5a8cdf29 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -36,7 +36,10 @@ def find_patches(d,subdir):
if subdir == patchdir:
patch_list.append(local)
else:
- patch_list.append(local)
+ # skip the patch if a patchdir was supplied, it won't be handled
+ # properly
+ if not patchdir:
+ patch_list.append(local)
return patch_list