From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Mon, 11 Mar 2019 04:20:51 +0000 (-0400)
Subject: linux-yocto: fix SRC_URI patching with unified repos
X-Git-Tag: uninative-2.4~42
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0fd09633e3c2fb4668c7700516d288f8c5356ff6;p=openembedded-core.git

linux-yocto: fix SRC_URI patching with unified repos

As reported by Paul Barker, my attempt to allow the patching
of kernel meta data broke other repository configurations, since
the meta data patch routing was matching too broadly and the
same repo would end up being patched twice.

Using his suggested fix, we are up and running with both types
of repos again.

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 bd7a957583..ed9bcfa57c 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -15,7 +15,7 @@ def find_patches(d,subdir):
         patchdir = ''
         if "patchdir" in parm:
             patchdir = parm["patchdir"]
-        if patchdir:
+        if subdir:
             if subdir == patchdir:
                 patch_list.append(local)
         else: