From 4b134d69dcb1d429727d9664672d060f822106dd Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 16 Feb 2011 14:48:57 -0700 Subject: 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 --- classes/native.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') 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 -- cgit 1.2.3-korg