diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2022-03-01 16:12:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-02 18:44:17 +0000 |
commit | a99b899a372e5a9c376bd8b684bb2fbb637c858a (patch) | |
tree | 732c7597a4b42c3a5eef2a3210ba2bfa643811d6 | |
parent | 911ee75249de54b198fecac37f4c92a8a69ea6ed (diff) | |
download | poky-a99b899a372e5a9c376bd8b684bb2fbb637c858a.tar.gz |
multilib_global.bbclass: fix setting preferred version for canadian recipes
Currently the TRANSLATED_TARGET_ARCH is not changed when trying
to set preferred version for canadian recipes.
e.g.
```
bitbake core-image-minimal -c populate_sdk -e > env
grep ^PREFERRED_VERSION_gcc-cross-canadian env
```
The result is:
"""
PREFERRED_VERSION_gcc-cross-canadian-x86-64="11.%"
"""
We need to explictly change DEFAULTTUNE to ensure TRANSLATED_TARGET_ARCH is
changed when trying to set the preferred version for multilib version of
the canadian recipes.
e.g.
```
bitbake core-image-minimal -c populate_sdk -e > env
grep ^PREFERRED_VERSION_gcc-cross-canadian env
```
The result is:
"""
PREFERRED_VERSION_gcc-cross-canadian-i686="11.%"
PREFERRED_VERSION_gcc-cross-canadian-x86-64="11.%"
"""
(From OE-Core rev: ab8ed74082ffaf3b3adca84f4c41465f89657e76)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/multilib_global.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index ab8ca0e41d..e06307d057 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass | |||
@@ -39,6 +39,9 @@ def preferred_ml_updates(d): | |||
39 | override = ":virtclass-multilib-" + p | 39 | override = ":virtclass-multilib-" + p |
40 | localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) | 40 | localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) |
41 | if "-canadian-" in pkg: | 41 | if "-canadian-" in pkg: |
42 | newtune = localdata.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + p, False) | ||
43 | if newtune: | ||
44 | localdata.setVar("DEFAULTTUNE", newtune) | ||
42 | newname = localdata.expand(v) | 45 | newname = localdata.expand(v) |
43 | else: | 46 | else: |
44 | newname = localdata.expand(v).replace(version_str, version_str + p + '-') | 47 | newname = localdata.expand(v).replace(version_str, version_str + p + '-') |