summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-08-08 09:23:29 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-25 14:47:06 +0100
commitd8b00e744b7b1d5a66930f91a4bce1945434ee82 (patch)
treed1a04808d2fcf503ecf33ab7eee54c3ca49477e5
parent4eb5ac8efba261ffceef85c884e274afb3ee17e3 (diff)
downloadpoky-d8b00e744b7b1d5a66930f91a4bce1945434ee82.tar.gz
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>
-rw-r--r--scripts/lib/bsp/engine.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index eb3efbf5c7..00ce863f03 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1498,7 +1498,7 @@ def yocto_bsp_list(args, scripts_path, properties_file):
1498def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch): 1498def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
1499 """ 1499 """
1500 Return the linux-yocto bsp branch to use with the specified 1500 Return the linux-yocto bsp branch to use with the specified
1501 kbranch. This handles the -standard variants for 3.0 and 3.2; the 1501 kbranch. This handles the -standard variants for 3.2 and 3.4; the
1502 other variants don't need mappings. 1502 other variants don't need mappings.
1503 """ 1503 """
1504 if need_new_kbranch == "y": 1504 if need_new_kbranch == "y":
@@ -1507,10 +1507,10 @@ def map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch):
1507 kbranch = existing_kbranch 1507 kbranch = existing_kbranch
1508 1508
1509 if (kbranch.startswith("standard/default/common-pc-64") or 1509 if (kbranch.startswith("standard/default/common-pc-64") or
1510 kbranch.startswith("yocto/standard/common-pc-64")): 1510 kbranch.startswith("standard/common-pc-64")):
1511 return "bsp/common-pc-64/common-pc-64-standard" 1511 return "bsp/common-pc-64/common-pc-64-standard"
1512 if (kbranch.startswith("standard/default/common-pc") or 1512 if (kbranch.startswith("standard/default/common-pc") or
1513 kbranch.startswith("yocto/standard/common-pc")): 1513 kbranch.startswith("standard/common-pc")):
1514 return "bsp/common-pc/common-pc-standard" 1514 return "bsp/common-pc/common-pc-standard"
1515 else: 1515 else:
1516 return "ktypes/standard" 1516 return "ktypes/standard"