diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2011-02-16 14:48:57 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2011-02-16 14:56:25 -0700 |
| commit | 4b134d69dcb1d429727d9664672d060f822106dd (patch) | |
| tree | 2562d154c43e1c0d451ff146a48075f8ee4fc532 /classes | |
| parent | c3910373895f5285b25281a6ef2190b1f187af7c (diff) | |
| download | openembedded-4b134d69dcb1d429727d9664672d060f822106dd.tar.gz | |
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@mentor.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/native.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/native.bbclass b/classes/native.bbclass index 23565811ee..000ad61fc4 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 |