From d8b00e744b7b1d5a66930f91a4bce1945434ee82 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@intel.com>
Date: Wed, 8 Aug 2012 09:23:29 -0500
Subject: 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>
---
scripts/lib/bsp/engine.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'scripts/lib')
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):
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"
--
cgit v1.2.3-54-g00ecf