[oe-commits] Richard Purdie : lib/oe/classextend: Ensure we don' t extend expressions more than once
git at git.openembedded.org
git at git.openembedded.org
Tue Nov 6 08:35:11 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 5e4714a454f9f742bf8af70dad2aa66ccb87e3fd
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5e4714a454f9f742bf8af70dad2aa66ccb87e3fd
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue Nov 6 09:29:00 2012 +0100
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 at linuxfoundation.org>
---
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))
More information about the Openembedded-commits
mailing list