summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-06 08:29:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-08 11:03:16 (GMT)
commit6798c0ef23a8e48719179305dd81a54a72b986fb (patch)
tree98c2bf1bac646f5a9d040149eafd8ed331176ec0
parent5e0124f00d4e50dd84f988b1d8c4ff40b0e1b371 (diff)
downloadpoky-6798c0ef23a8e48719179305dd81a54a72b986fb.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: 18b401f4f8e931dca08a2e9be34e94c49b5215b9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 857a6c9..fe9b566 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))