sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

scripts/lib/bsp/engine.py: update map_standard_kbranch() 

Update map_standard_kbranch() to be consistent with the new changes in
meta naming and remove obsolete standard/default mapping.

(From meta-yocto rev: 40998ba44e1a4ebb1c165cab1a250025041e0da0)

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tom Zanussi 2013-03-04 00:04:49 -06:00 committed by Richard Purdie
parent 60df8b4853
commit 64bdab9276
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/lib/bsp/engine.py
View File

@ -1727,7 +1727,7 @@ def yocto_layer_list(args, scripts_path, properties_file):
def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
"""
Return the linux-yocto bsp branch to use with the specified
kbranch. This handles the -standard variants for 3.2 and 3.4; the
kbranch. This handles the -standard variants for 3.4 and 3.8; the
other variants don't need mappings.
"""
if need_new_kbranch == "y":
@ -1735,11 +1735,9 @@ def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
else:
kbranch = existing_kbranch
if (kbranch.startswith("standard/default/common-pc-64") or
kbranch.startswith("standard/common-pc-64")):
return "bsp/common-pc-64/common-pc-64-standard"
if (kbranch.startswith("standard/default/common-pc") or
kbranch.startswith("standard/common-pc")):
return "bsp/common-pc/common-pc-standard"
if kbranch.startswith("standard/common-pc-64"):
return "bsp/common-pc-64/common-pc-64-standard.scc"
if kbranch.startswith("standard/common-pc"):
return "bsp/common-pc/common-pc-standard.scc"
else:
return "ktypes/standard"
return "ktypes/standard/standard.scc"