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:56:50 +0100 |
commit | a1dda84fe8b8abbe61f48a1a43d3c19dc5133825 (patch) | |
tree | b929b2b9d0d99dbe3d15d7a107e72da961f0b12a | |
parent | a087862d022a34a2b03dd17b8fdc0ad871f14a05 (diff) | |
download | poky-a1dda84fe8b8abbe61f48a1a43d3c19dc5133825.tar.gz |
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 <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 () { | |||
154 | newdeps.append(dep) | 154 | newdeps.append(dep) |
155 | d.setVar(varname, " ".join(newdeps)) | 155 | d.setVar(varname, " ".join(newdeps)) |
156 | 156 | ||
157 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native") | ||
158 | |||
159 | map_dependencies("DEPENDS", e.data) | 157 | map_dependencies("DEPENDS", e.data) |
160 | for pkg in [e.data.getVar("PN"), "", "${PN}"]: | 158 | for pkg in [e.data.getVar("PN"), "", "${PN}"]: |
161 | map_dependencies("RDEPENDS", e.data, pkg) | 159 | 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 () { | |||
78 | 78 | ||
79 | e.data.setVar("MLPREFIX", "nativesdk-") | 79 | e.data.setVar("MLPREFIX", "nativesdk-") |
80 | e.data.setVar("PN", "nativesdk-" + e.data.getVar("PN").replace("-nativesdk", "").replace("nativesdk-", "")) | 80 | e.data.setVar("PN", "nativesdk-" + e.data.getVar("PN").replace("-nativesdk", "").replace("nativesdk-", "")) |
81 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-nativesdk") | ||
82 | } | 81 | } |
83 | 82 | ||
84 | python () { | 83 | python () { |