[oe-commits] [openembedded-core] 03/04: classes/utils: Improve all_multilib_tune_values

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b6e76c9b543ed4b0bc44ae8c3ee0fb056bd960fc
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Jul 2 08:59:34 2018 +0000

    classes/utils: Improve all_multilib_tune_values
    
    Currently there is duplication in the code, we can clean this up
    by extending the multilib variants list.
    
    This code also currently fails its its called from an existing multilib
    context since its assumes the data store passed in is the non-multilib
    case. When building an image, say lib32-core-image-sato, this leads to
    incorrect PATH values.
    
    To fix this, we also request a data store for the "" variant allowing
    this corner case to be fixed and for the function to correctly return
    values for each multilib even when a multilib is already selected.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/utils.bbclass | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 09a07ec..b2c7338 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -328,15 +328,8 @@ def get_multilib_datastore(variant, d):
 def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '):
     """Return a string of all ${var} in all multilib tune configuration"""
     values = []
-    value = d.getVar(var) or ""
-    if value != "":
-        if need_split:
-            for item in value.split(delim):
-                values.append(item)
-        else:
-            values.append(value)
-    variants = d.getVar("MULTILIB_VARIANTS") or ""
-    for item in variants.split():
+    variants = (d.getVar("MULTILIB_VARIANTS") or "").split() + ['']
+    for item in variants:
         localdata = get_multilib_datastore(item, d)
         # Used in populate_sdk_base we want it to point at the correct workdir
         if var == "STAGING_BINDIR_CROSS":

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.