From ab8ed74082ffaf3b3adca84f4c41465f89657e76 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 1 Mar 2022 16:12:18 +0800 Subject: 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.%" """ Signed-off-by: Chen Qi Signed-off-by: Richard Purdie --- meta/classes/multilib_global.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/classes/multilib_global.bbclass') 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): override = ":virtclass-multilib-" + p localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) if "-canadian-" in pkg: + newtune = localdata.getVar("DEFAULTTUNE:" + "virtclass-multilib-" + p, False) + if newtune: + localdata.setVar("DEFAULTTUNE", newtune) newname = localdata.expand(v) else: newname = localdata.expand(v).replace(version_str, version_str + p + '-') -- cgit 1.2.3-korg