diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-06 09:29:00 +0100 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2013-04-30 11:06:09 +0100 |
commit | 18b401f4f8e931dca08a2e9be34e94c49b5215b9 (patch) | |
tree | c9661ce0ad5de03e758e973240830e63abf6af11 | |
parent | d4f366c00335d28b90e1b071631aa90ce9d38321 (diff) | |
download | openembedded-core-18b401f4f8e931dca08a2e9be34e94c49b5215b9.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>
-rw-r--r-- | meta/lib/oe/classextend.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index 857a6c97ef..fe9b566e7c 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)) |