diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-06 09:29:00 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-06 09:34:47 +0100 |
| commit | 78983e939ab17f02f8911c8b0d0e326b419856b9 (patch) | |
| tree | be806c5558778e695a525ce2a568d8b6710b9bd9 /meta/lib | |
| parent | e421e95de0ce430cc2c6db9b0712a66ab96288a1 (diff) | |
| download | ast2050-yocto-poky-78983e939ab17f02f8911c8b0d0e326b419856b9.zip ast2050-yocto-poky-78983e939ab17f02f8911c8b0d0e326b419856b9.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: 5e4714a454f9f742bf8af70dad2aa66ccb87e3fd)
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 c46332c..19e1254 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)) |
