From: Andre McCurdy Date: Thu, 10 May 2018 03:14:56 +0000 (-0700) Subject: native.bbclass: drop _virtclass-native and _virtclass-nativesdk overrides X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~17896 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5aa33ac483618bc23fbaccb0a18853186f9155d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git native.bbclass: drop _virtclass-native and _virtclass-nativesdk overrides The _virtclass-XXX over-rides are problematic in that they are higher priority than _forcevariable, which is documented as being the highest priority over-ride. Since they are now obsolete (replaced by _class-native and _class-nativesdk) drop them entirely rather than try to fix their priority. Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton --- diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 7f2df17f233..ad7e98af17e 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -154,8 +154,6 @@ python native_virtclass_handler () { newdeps.append(dep) d.setVar(varname, " ".join(newdeps)) - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native") - map_dependencies("DEPENDS", e.data) for pkg in [e.data.getVar("PN"), "", "${PN}"]: map_dependencies("RDEPENDS", e.data, pkg) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index 69fb45c8a58..ab566e98034 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -78,7 +78,6 @@ python nativesdk_virtclass_handler () { e.data.setVar("MLPREFIX", "nativesdk-") e.data.setVar("PN", "nativesdk-" + e.data.getVar("PN").replace("-nativesdk", "").replace("nativesdk-", "")) - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-nativesdk") } python () {