summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-03-04 06:04:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-17 23:10:27 (GMT)
commit64bdab9276a971c67597f93ff375a8c82d06ba87 (patch)
treebf3739b0a849347689fbd45d56e73bb0fb6c7a8e /scripts/lib
parent60df8b48536aaaed4d069ca59e37fb2ee6a73526 (diff)
downloadpoky-64bdab9276a971c67597f93ff375a8c82d06ba87.tar.gz
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>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/bsp/engine.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index aa26280..55f1e6b 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1727,7 +1727,7 @@ def yocto_layer_list(args, scripts_path, properties_file):
1727def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch): 1727def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
1728 """ 1728 """
1729 Return the linux-yocto bsp branch to use with the specified 1729 Return the linux-yocto bsp branch to use with the specified
1730 kbranch. This handles the -standard variants for 3.2 and 3.4; the 1730 kbranch. This handles the -standard variants for 3.4 and 3.8; the
1731 other variants don't need mappings. 1731 other variants don't need mappings.
1732 """ 1732 """
1733 if need_new_kbranch == "y": 1733 if need_new_kbranch == "y":
@@ -1735,11 +1735,9 @@ def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
1735 else: 1735 else:
1736 kbranch = existing_kbranch 1736 kbranch = existing_kbranch
1737 1737
1738 if (kbranch.startswith("standard/default/common-pc-64") or 1738 if kbranch.startswith("standard/common-pc-64"):
1739 kbranch.startswith("standard/common-pc-64")): 1739 return "bsp/common-pc-64/common-pc-64-standard.scc"
1740 return "bsp/common-pc-64/common-pc-64-standard" 1740 if kbranch.startswith("standard/common-pc"):
1741 if (kbranch.startswith("standard/default/common-pc") or 1741 return "bsp/common-pc/common-pc-standard.scc"
1742 kbranch.startswith("standard/common-pc")):
1743 return "bsp/common-pc/common-pc-standard"
1744 else: 1742 else:
1745 return "ktypes/standard" 1743 return "ktypes/standard/standard.scc"