mirror of
https://git.yoctoproject.org/poky
synced 2026-07-27 07:27:12 +00:00
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>
This commit is contained in:
@@ -39,6 +39,9 @@ def preferred_ml_updates(d):
|
|||||||
override = ":virtclass-multilib-" + p
|
override = ":virtclass-multilib-" + p
|
||||||
localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override)
|
localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override)
|
||||||
if "-canadian-" in pkg:
|
if "-canadian-" in pkg:
|
||||||
|
newtune = localdata.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + p, False)
|
||||||
|
if newtune:
|
||||||
|
localdata.setVar("DEFAULTTUNE", newtune)
|
||||||
newname = localdata.expand(v)
|
newname = localdata.expand(v)
|
||||||
else:
|
else:
|
||||||
newname = localdata.expand(v).replace(version_str, version_str + p + '-')
|
newname = localdata.expand(v).replace(version_str, version_str + p + '-')
|
||||||
|
|||||||
Reference in New Issue
Block a user