diff options
Diffstat (limited to 'bitbake/lib/bb/cache.py')
-rw-r--r-- | bitbake/lib/bb/cache.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 060758e0c4..5fb2f17cda 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -237,7 +237,7 @@ def virtualfn2realfn(virtualfn): | |||
237 | Convert a virtual file name to a real one + the associated subclass keyword | 237 | Convert a virtual file name to a real one + the associated subclass keyword |
238 | """ | 238 | """ |
239 | mc = "" | 239 | mc = "" |
240 | if virtualfn.startswith('multiconfig:'): | 240 | if virtualfn.startswith('mc:'): |
241 | elems = virtualfn.split(':') | 241 | elems = virtualfn.split(':') |
242 | mc = elems[1] | 242 | mc = elems[1] |
243 | virtualfn = ":".join(elems[2:]) | 243 | virtualfn = ":".join(elems[2:]) |
@@ -258,7 +258,7 @@ def realfn2virtual(realfn, cls, mc): | |||
258 | if cls: | 258 | if cls: |
259 | realfn = "virtual:" + cls + ":" + realfn | 259 | realfn = "virtual:" + cls + ":" + realfn |
260 | if mc: | 260 | if mc: |
261 | realfn = "multiconfig:" + mc + ":" + realfn | 261 | realfn = "mc:" + mc + ":" + realfn |
262 | return realfn | 262 | return realfn |
263 | 263 | ||
264 | def variant2virtual(realfn, variant): | 264 | def variant2virtual(realfn, variant): |
@@ -267,11 +267,11 @@ def variant2virtual(realfn, variant): | |||
267 | """ | 267 | """ |
268 | if variant == "": | 268 | if variant == "": |
269 | return realfn | 269 | return realfn |
270 | if variant.startswith("multiconfig:"): | 270 | if variant.startswith("mc:"): |
271 | elems = variant.split(":") | 271 | elems = variant.split(":") |
272 | if elems[2]: | 272 | if elems[2]: |
273 | return "multiconfig:" + elems[1] + ":virtual:" + ":".join(elems[2:]) + ":" + realfn | 273 | return "mc:" + elems[1] + ":virtual:" + ":".join(elems[2:]) + ":" + realfn |
274 | return "multiconfig:" + elems[1] + ":" + realfn | 274 | return "mc:" + elems[1] + ":" + realfn |
275 | return "virtual:" + variant + ":" + realfn | 275 | return "virtual:" + variant + ":" + realfn |
276 | 276 | ||
277 | def parse_recipe(bb_data, bbfile, appends, mc=''): | 277 | def parse_recipe(bb_data, bbfile, appends, mc=''): |
@@ -349,7 +349,7 @@ class NoCache(object): | |||
349 | bb_data = self.databuilder.mcdata[mc].createCopy() | 349 | bb_data = self.databuilder.mcdata[mc].createCopy() |
350 | newstores = parse_recipe(bb_data, bbfile, appends, mc) | 350 | newstores = parse_recipe(bb_data, bbfile, appends, mc) |
351 | for ns in newstores: | 351 | for ns in newstores: |
352 | datastores["multiconfig:%s:%s" % (mc, ns)] = newstores[ns] | 352 | datastores["mc:%s:%s" % (mc, ns)] = newstores[ns] |
353 | 353 | ||
354 | return datastores | 354 | return datastores |
355 | 355 | ||