diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/patch.bbclass | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 80fd45f0e..762216345 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass @@ -31,10 +31,8 @@ python patch_do_patch() { path = os.getenv('PATH') os.putenv('PATH', bb.data.getVar('PATH', d, 1)) - patchset = cls(s, d) - patchset.Clean() - resolver = rcls(patchset) + classes = {} workdir = bb.data.getVar('WORKDIR', d, 1) for url in src_uri: @@ -117,6 +115,21 @@ python patch_do_patch() { bb.note("Patch '%s' doesn't apply to revision" % pname) continue + if "patchdir" in parm: + patchdir = parm["patchdir"] + if not os.path.isabs(patchdir): + patchdir = os.path.join(s, patchdir) + else: + patchdir = s + + if not patchdir in classes: + patchset = cls(patchdir, d) + resolver = rcls(patchset) + classes[patchdir] = (patchset, resolver) + patchset.Clean() + else: + patchset, resolver = classes[patchdir] + bb.note("Applying patch '%s' (%s)" % (pname, oe.path.format_display(local, d))) try: patchset.Import({"file":local, "remote":url, "strippath": striplevel}, True) |