diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/multilib_global.bbclass | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
-rw-r--r-- | meta/classes/multilib_global.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index 96257de5ca..dae015cdaf 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass | |||
@@ -164,8 +164,8 @@ def preferred_ml_updates(d): | |||
164 | python multilib_virtclass_handler_vendor () { | 164 | python multilib_virtclass_handler_vendor () { |
165 | if isinstance(e, bb.event.ConfigParsed): | 165 | if isinstance(e, bb.event.ConfigParsed): |
166 | for v in e.data.getVar("MULTILIB_VARIANTS").split(): | 166 | for v in e.data.getVar("MULTILIB_VARIANTS").split(): |
167 | if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None: | 167 | if e.data.getVar("TARGET_VENDOR:virtclass-multilib-" + v, False) is None: |
168 | e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v) | 168 | e.data.setVar("TARGET_VENDOR:virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v) |
169 | preferred_ml_updates(e.data) | 169 | preferred_ml_updates(e.data) |
170 | } | 170 | } |
171 | addhandler multilib_virtclass_handler_vendor | 171 | addhandler multilib_virtclass_handler_vendor |
@@ -207,13 +207,13 @@ python multilib_virtclass_handler_global () { | |||
207 | if rprovs.strip(): | 207 | if rprovs.strip(): |
208 | e.data.setVar("RPROVIDES", rprovs) | 208 | e.data.setVar("RPROVIDES", rprovs) |
209 | 209 | ||
210 | # Process RPROVIDES_${PN}... | 210 | # Process RPROVIDES:${PN}... |
211 | for pkg in (e.data.getVar("PACKAGES") or "").split(): | 211 | for pkg in (e.data.getVar("PACKAGES") or "").split(): |
212 | origrprovs = rprovs = localdata.getVar("RPROVIDES_%s" % pkg) or "" | 212 | origrprovs = rprovs = localdata.getVar("RPROVIDES:%s" % pkg) or "" |
213 | for clsextend in clsextends: | 213 | for clsextend in clsextends: |
214 | rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES_%s" % pkg, setvar=False) | 214 | rprovs = rprovs + " " + clsextend.map_variable("RPROVIDES:%s" % pkg, setvar=False) |
215 | rprovs = rprovs + " " + clsextend.extname + "-" + pkg | 215 | rprovs = rprovs + " " + clsextend.extname + "-" + pkg |
216 | e.data.setVar("RPROVIDES_%s" % pkg, rprovs) | 216 | e.data.setVar("RPROVIDES:%s" % pkg, rprovs) |
217 | } | 217 | } |
218 | 218 | ||
219 | addhandler multilib_virtclass_handler_global | 219 | addhandler multilib_virtclass_handler_global |