From 7cc512559b8294508a89292fbd95a2522d81c324 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 5 Oct 2021 20:12:46 -0400 Subject: kernel-yocto: don't apply config metadata patches twice (From OE-Core rev: 0b88ed0af350c609ce8075e7d89ca7db91486858) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf