summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-06 09:29:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-06 09:34:47 +0100
commit78983e939ab17f02f8911c8b0d0e326b419856b9 (patch)
treebe806c5558778e695a525ce2a568d8b6710b9bd9 /meta/lib
parente421e95de0ce430cc2c6db9b0712a66ab96288a1 (diff)
downloadpoky-78983e939ab17f02f8911c8b0d0e326b419856b9.tar.gz
lib/oe/classextend: Ensure we don't extend expressions more than once
We could end up with MLPREFIX being prepended to variables like PACKAGE_DYNAMIC. This patch avoids the problem and unbreaks builds. [YOCTO #3389] (From OE-Core rev: 5e4714a454f9f742bf8af70dad2aa66ccb87e3fd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/classextend.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index c46332c785..19e1254637 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -40,7 +40,9 @@ class ClassExtender(object):
40 var = var.split() 40 var = var.split()
41 newvar = [] 41 newvar = []
42 for v in var: 42 for v in var:
43 if v.startswith("^"): 43 if v.startswith("^" + self.extname):
44 newvar.append(v)
45 elif v.startswith("^"):
44 newvar.append("^" + self.extname + "-" + v[1:]) 46 newvar.append("^" + self.extname + "-" + v[1:])
45 else: 47 else:
46 newvar.append(self.extend_name(v)) 48 newvar.append(self.extend_name(v))