diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2018-05-09 20:14:56 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-15 10:00:31 +0100 |
| commit | c5aa33ac483618bc23fbaccb0a18853186f9155d (patch) | |
| tree | 05333752860f7beeb1de0150e8167271a5025dfe | |
| parent | efcf629e2d84bacb955201d1960969020796678e (diff) | |
| download | openembedded-core-c5aa33ac483618bc23fbaccb0a18853186f9155d.tar.gz openembedded-core-c5aa33ac483618bc23fbaccb0a18853186f9155d.tar.bz2 openembedded-core-c5aa33ac483618bc23fbaccb0a18853186f9155d.zip | |
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 <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/native.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/nativesdk.bbclass | 1 |
2 files changed, 0 insertions, 3 deletions
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 () { |