From: Chase Maupin Date: Fri, 15 Oct 2010 10:32:28 +0000 (+0000) Subject: Fix class OVERRIDES order X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb8697d9dfd35b4195ddfdf64f1c459ffadd437e;p=openembedded.git Fix class OVERRIDES order * Changed the OVERRIDES settings in the classes to use the new ordering. Signed-off-by: Chase Maupin Acked-by: Chris Larson Signed-off-by: Koen Kooi --- diff --git a/classes/native.bbclass b/classes/native.bbclass index dcedff28ff..2e52bfcb24 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -94,7 +94,7 @@ DEPENDS_virtclass-native ?= "${ORIG_DEPENDS}" def native_virtclass_add_override(d): if "native" in (bb.data.getVar('BBCLASSEXTEND', d, True) or ""): - bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", d, False) + ":virtclass-native", d) + bb.data.setVar("OVERRIDES", "virtclass-native:" + bb.data.getVar("OVERRIDES", d, False), d) OVERRIDES .= "${@native_virtclass_add_override(d)}" diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass index f3f993033f..6f2153436a 100644 --- a/classes/nativesdk.bbclass +++ b/classes/nativesdk.bbclass @@ -52,7 +52,7 @@ export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" ORIG_DEPENDS := "${DEPENDS}" DEPENDS_virtclass-nativesdk ?= "${ORIG_DEPENDS}" -OVERRIDES .= ":virtclass-nativesdk" +OVERRIDES =. "virtclass-nativesdk:" python __anonymous () { pn = bb.data.getVar("PN", d, True) diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index c8fa076c96..1ad8951a4c 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -67,4 +67,4 @@ FILES_${PN}-dbg += "${prefix}/.debug \ export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" -OVERRIDES .= ":virtclass-sdk" +OVERRIDES =. "virtclass-sdk:"