mirror of
https://git.yoctoproject.org/poky
synced 2026-03-19 13:49:41 +01:00
yocto-bsp: update standard branch mapping
Remove mapping for 3.0 and add mapping for 3.4. (From meta-yocto rev: e4ddfcda2cc6aad0c3e99066d43d69f5c1ab2f18) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
4eb5ac8efb
commit
d8b00e744b
@@ -1498,7 +1498,7 @@ def yocto_bsp_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.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":
|
||||
@@ -1507,10 +1507,10 @@ def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
|
||||
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"
|
||||
|
||||
Reference in New Issue
Block a user