From a1dda84fe8b8abbe61f48a1a43d3c19dc5133825 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 9 May 2018 20:14:56 -0700 Subject: 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. (From OE-Core rev: c5aa33ac483618bc23fbaccb0a18853186f9155d) Signed-off-by: Andre McCurdy Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/native.bbclass | 2 -- meta/classes/nativesdk.bbclass | 1 - 2 files changed, 3 deletions(-) (limited to 'meta') diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 7f2df17f23..ad7e98af17 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 69fb45c8a5..ab566e9803 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 () { -- cgit v1.2.3-54-g00ecf