From 4febd376ed5e64dd5e1b7050d3c970be1476441a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 31 Mar 2011 10:45:57 -0700 Subject: patch.bbclass: allow importing patches into other dirs This is taken from openembedded.master: commit 9d0d70da60ca8ef278916f442125d41161846f38 Author: Chris Larson Date: Mon Aug 23 13:03:55 2010 -0400 patch: allow importing patches into other dirs Use the 'patchdir' flag. If relative, it's assumed to be relative to ${S}. It creates a patchset class per patch directory, so for quilt this results i multiple .pc/patches directories to manage each of the patchsets. (From OE-Core rev: 01e4609ee8441c8212725fd062782313caae0708) Signed-off-by: Chris Larson Signed-off-by: Tom Rini Signed-off-by: Richard Purdie --- meta/classes/patch.bbclass | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 80fd45f0e3..762216345a 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) -- cgit v1.2.3-54-g00ecf