diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-06 09:29:00 +0100 |
|---|---|---|
| committer |   Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2012-11-29 12:00:27 +0100 |
| commit | 1b440ce2ec2047c4a005c0de5cda3288caae2e79 (patch) | |
| tree | 507eba2fa68619f42da3b2e24b67121c91b92b12 /meta/lib | |
| parent | cc8365962474cb974b3809cf0e9ae9012e69a7ba (diff) | |
| download | openembedded-core-contrib-1b440ce2ec2047c4a005c0de5cda3288caae2e79.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')
| -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 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)) |