From 78983e939ab17f02f8911c8b0d0e326b419856b9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 6 Nov 2012 09:29:00 +0100 Subject: 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 --- meta/lib/oe/classextend.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/lib') 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)) -- cgit v1.2.3-54-g00ecf