From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 6 Nov 2012 08:29:00 +0000 (+0100)
Subject: lib/oe/classextend: Ensure we don't extend expressions more than once
X-Git-Tag: 2015-4~8731
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5e4714a454f9f742bf8af70dad2aa66ccb87e3fd;p=openembedded-core.git

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 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))