summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-22 12:20:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-22 14:59:29 +0100
commitc4c37bcf1d10c52e790443715e001f6a6f4ef167 (patch)
tree0fe4f82d9781ee099a9f5c924595e15b21ebfd09 /meta/lib/oe
parentf07be9d2b68ac4e184ce2670bfa65b8d944387aa (diff)
downloadpoky-c4c37bcf1d10c52e790443715e001f6a6f4ef167.tar.gz
multilib/clsextend: Improve handling of regexps in PACKAGES_DYNAMIC
Now that PACKAGES_DYNAMIC is more standardised, starting with ^ anchors, the variable manipulations performed by clsextend for multilib don't work. This patch at least improves it to hack around the problem and enable mulitlib builds to work again. If this code doesn't do the right thing, the recipe is free to override the variable with the correct multilib case. (From OE-Core rev: 593faec6e0155bdd7a43ee84c24de8ee20287681) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/classextend.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index 86b1e8a554..857a6c97ef 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -33,6 +33,22 @@ class ClassExtender(object):
33 self.d.setVar(varname, newdata) 33 self.d.setVar(varname, newdata)
34 return newdata 34 return newdata
35 35
36 def map_regexp_variable(self, varname, setvar = True):
37 var = self.d.getVar(varname, True)
38 if not var:
39 return ""
40 var = var.split()
41 newvar = []
42 for v in var:
43 if v.startswith("^"):
44 newvar.append("^" + self.extname + "-" + v[1:])
45 else:
46 newvar.append(self.extend_name(v))
47 newdata = " ".join(newvar)
48 if setvar:
49 self.d.setVar(varname, newdata)
50 return newdata
51
36 def map_depends(self, dep): 52 def map_depends(self, dep):
37 if dep.endswith(("-native", "-native-runtime")): 53 if dep.endswith(("-native", "-native-runtime")):
38 return dep 54 return dep