[oe-commits] Chris Larson : native: fix duplicating virtclass-native entries in OVERRIDES

[git version control]

Module: openembedded.git
Branch: master
Commit: 4b134d69dcb1d429727d9664672d060f822106dd
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4b134d69dcb1d429727d9664672d060f822106dd

Author: Chris Larson <chris_larson at mentor.com>
Date:   Wed Feb 16 14:48:57 2011 -0700

native: fix duplicating virtclass-native entries in OVERRIDES

A function was called from ${@} in OVERRIDES which was supposed to return the
bits to prepend when in virtclass context, yet it *set* overrides instead,
returning None.  This resulted in 1) adding an extra virtclass-native to
OVERRIDES each time it was expanded, and 2) appending None, causing
'localNone' to be in overrides rather than the expected 'local'.

Signed-off-by: Chris Larson <chris_larson at mentor.com>

---

 classes/native.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/native.bbclass b/classes/native.bbclass
index 2356581..000ad61 100644
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -92,11 +92,11 @@ ORIG_DEPENDS := "${DEPENDS}"
 
 DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}"
 
-def native_virtclass_add_override(d):
+def native_virtclass_override(d):
     if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""):
-        bb.data.setVar("OVERRIDES", "virtclass-native:" + bb.data.getVar("OVERRIDES", d, False), d)
+        return 'virtclass-native:'
 
-OVERRIDES .= "${@native_virtclass_add_override(d)}"
+OVERRIDES =. "${@native_virtclass_override(d)}"
 
 python __anonymous () {
     # If we've a legacy native do_stage, we need to neuter do_install