diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/multilib_global.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index 67dc72b76c..11ae2681f0 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass | |||
@@ -72,6 +72,7 @@ def preferred_ml_updates(d): | |||
72 | pkg = pkg.replace("virtual/", "") | 72 | pkg = pkg.replace("virtual/", "") |
73 | virt = "virtual/" | 73 | virt = "virtual/" |
74 | for p in prefixes: | 74 | for p in prefixes: |
75 | newval = None | ||
75 | if pkg != "kernel": | 76 | if pkg != "kernel": |
76 | newval = p + "-" + val | 77 | newval = p + "-" + val |
77 | 78 | ||
@@ -86,7 +87,7 @@ def preferred_ml_updates(d): | |||
86 | 87 | ||
87 | # implement alternative multilib name | 88 | # implement alternative multilib name |
88 | newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg) | 89 | newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg) |
89 | if not d.getVar(newname, False): | 90 | if not d.getVar(newname, False) and newval != None: |
90 | d.setVar(newname, localdata.expand(newval)) | 91 | d.setVar(newname, localdata.expand(newval)) |
91 | # Avoid future variable key expansion | 92 | # Avoid future variable key expansion |
92 | provexp = d.expand(prov) | 93 | provexp = d.expand(prov) |