[yocto] [PATCH 15/19] yocto-bsp: update standard branch mapping

[tom.zanussi at intel.com]

From: Tom Zanussi <tom.zanussi at intel.com>

Remove mapping for 3.0 and add mapping for 3.4.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 scripts/lib/bsp/engine.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index 9d16b19..ac5058c 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1508,7 +1508,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":
@@ -1517,10 +1517,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"
-- 
1.7.9.5