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.0 and 3.2; the
+ kbranch. This handles the -standard variants for 3.2 and 3.4; the
other variants don't need mappings.
"""
if need_new_kbranch == "y":
kbranch = existing_kbranch
if (kbranch.startswith("standard/default/common-pc-64") or
- kbranch.startswith("yocto/standard/common-pc-64")):
+ 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("yocto/standard/common-pc")):
+ kbranch.startswith("standard/common-pc")):
return "bsp/common-pc/common-pc-standard"
else:
return "ktypes/standard"