[PATCH 0/2] yocto bsp tools bugfixes

[PATCH 0/2] yocto bsp tools bugfixes

[Tom Zanussi]

This patchset fixes a couple bugs in the yocto bsp tools.

The first one [yocto-bsp: filter out 'layer' from arch list] is just an
unchanged repost of the patch that was posted a couple weeks ago and never
got picked up.  It needs to go into both master and the next 1.4 point
release.  The second one should go into master.

The following changes since commit 8a186a6b3853fc1a7dcf342d421c8926c38949c9:

  bitbake: hob: save button from settings called a nonexisting method (2013-07-03 08:13:35 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib.git tzanussi/bug-4735-repost-and-bug-4743
  http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/bug-4735-repost-and-bug-4743

Tom Zanussi (2):
  yocto-bsp: filter out 'layer' from arch list
  yocto-kernel: enforce exact match for BBLAYERS

 scripts/lib/bsp/engine.py | 2 +-
 scripts/lib/bsp/kernel.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
1.7.11.4

[PATCH 1/2] yocto-bsp: filter out 'layer' from arch list

[Tom Zanussi]

The yocto-layer tool added a new directory alongside the actual
architectures and 'common', which is already screened out as not an
actual architecture when displaying the architecures.

The same needs to be done for 'layer' which isn't actually an
architecuture and likewise needs to be screened out.

Fixes [YOCTO #4735].

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 scripts/lib/bsp/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py
index 36bd446..681720d 100644
--- a/scripts/lib/bsp/engine.py
+++ b/scripts/lib/bsp/engine.py
@@ -1674,7 +1674,7 @@ def yocto_bsp_list(args, scripts_path, properties_file):
         arch_path = bsp_path + '/substrate/target/arch'
         print "Architectures available:"
         for arch in os.listdir(arch_path):
-            if arch == "common":
+            if arch == "common" or arch == "layer":
                 continue
             print "    %s" % arch
         return True
-- 
1.7.11.4

[PATCH 2/2] yocto-kernel: enforce exact match for BBLAYERS

[Tom Zanussi]

The current code uses .startswith to find BBLAYERS, which causes false
positives when other variables such as BBLAYERS_NON_REMOVABLE exist.

This forces an exact match instead of a partial match.

Fixes [YOCTO #4743].

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 scripts/lib/bsp/kernel.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py
index 94ae950..c3592a3 100644
--- a/scripts/lib/bsp/kernel.py
+++ b/scripts/lib/bsp/kernel.py
@@ -54,7 +54,8 @@ def find_bblayers(scripts_path):
     in_bblayers = False
     for line in lines:
         line = line.strip()
-        if line.strip().startswith("BBLAYERS"):
+        tokens = line.split()
+        if len(tokens) > 0 and tokens[0] == 'BBLAYERS':
             bblayers_lines.append(line)
             in_bblayers = True
             quotes = line.strip().count('"')
-- 
1.7.11.4