diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 93bc700a50..d0793b671e 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -210,7 +210,7 @@ def preferred_ml_updates(d): | |||
210 | virt = "virtual/" | 210 | virt = "virtual/" |
211 | for p in prefixes: | 211 | for p in prefixes: |
212 | if pkg != "kernel": | 212 | if pkg != "kernel": |
213 | val = p + "-" + val | 213 | newval = p + "-" + val |
214 | 214 | ||
215 | # implement variable keys | 215 | # implement variable keys |
216 | localdata = bb.data.createCopy(d) | 216 | localdata = bb.data.createCopy(d) |
@@ -219,12 +219,12 @@ def preferred_ml_updates(d): | |||
219 | bb.data.update_data(localdata) | 219 | bb.data.update_data(localdata) |
220 | newname = localdata.expand(prov) | 220 | newname = localdata.expand(prov) |
221 | if newname != prov and not d.getVar(newname, False): | 221 | if newname != prov and not d.getVar(newname, False): |
222 | d.setVar(newname, localdata.expand(val)) | 222 | d.setVar(newname, localdata.expand(newval)) |
223 | 223 | ||
224 | # implement alternative multilib name | 224 | # implement alternative multilib name |
225 | newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg) | 225 | newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg) |
226 | if not d.getVar(newname, False): | 226 | if not d.getVar(newname, False): |
227 | d.setVar(newname, val) | 227 | d.setVar(newname, newval) |
228 | # Avoid future variable key expansion | 228 | # Avoid future variable key expansion |
229 | provexp = d.expand(prov) | 229 | provexp = d.expand(prov) |
230 | if prov != provexp and d.getVar(prov, False): | 230 | if prov != provexp and d.getVar(prov, False): |