aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
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:29:03 +0100
commit5e4714a454f9f742bf8af70dad2aa66ccb87e3fd (patch)
tree71c9eac4c65108cea032bf52e653566cab384e0b /meta/lib/oe
parente57278dfde1f975fa34e72354749bbc91380f36b (diff)
downloadopenembedded-core-5e4714a454f9f742bf8af70dad2aa66ccb87e3fd.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] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-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):
var = var.split()
newvar = []
for v in var:
- if v.startswith("^"):
+ if v.startswith("^" + self.extname):
+ newvar.append(v)
+ elif v.startswith("^"):
newvar.append("^" + self.extname + "-" + v[1:])
else:
newvar.append(self.extend_name(v))