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>

diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index 857a6c97efda92bf3a5c831d19fe0fe6095d0768..fe9b566e7cb33b9396abd63322c0cdff0189f020 100644 (file)
--- 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))