From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Wed, 6 Oct 2021 00:12:46 +0000 (-0400)
Subject: kernel-yocto: don't apply config metadata patches twice
X-Git-Tag: yocto-3.4~14
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0b88ed0af350c609ce8075e7d89ca7db91486858;p=openembedded-core.git

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>
---

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