summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-07-03 20:13:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-05 14:40:30 (GMT)
commitf8c8c7d78aa8a65b8e6466d4dab419b1d608e026 (patch)
tree7fda50aaea9f900ac81e3f91b7a3047ca296c3b0 /scripts
parent04b36b14b6867f7b3495844ead4d3e569c61e6d6 (diff)
downloadpoky-f8c8c7d78aa8a65b8e6466d4dab419b1d608e026.tar.gz
yocto-kernel: enforce exact match for BBLAYERS
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]. (From meta-yocto rev: c039def50ca6c02cb1b66fd4bf76664de42c068e) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/kernel.py3
1 files changed, 2 insertions, 1 deletions
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):
54 in_bblayers = False 54 in_bblayers = False
55 for line in lines: 55 for line in lines:
56 line = line.strip() 56 line = line.strip()
57 if line.strip().startswith("BBLAYERS"): 57 tokens = line.split()
58 if len(tokens) > 0 and tokens[0] == 'BBLAYERS':
58 bblayers_lines.append(line) 59 bblayers_lines.append(line)
59 in_bblayers = True 60 in_bblayers = True
60 quotes = line.strip().count('"') 61 quotes = line.strip().count('"')