summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2013-07-03 20:13:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-09 10:53:57 +0100
commit2d79d0488528d31159d5f2ede088e80f30d22559 (patch)
treede23ad3e24ad7e873609a57300c1ba7b570775ed
parent0d5380fd3f3fa08e1cbade8582c8fc4ece3cceeb (diff)
downloadpoky-2d79d0488528d31159d5f2ede088e80f30d22559.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 master rev: c039def50ca6c02cb1b66fd4bf76664de42c068e) (From meta-yocto rev: bb46a14833d18000e87b76d06df04ef9a7f40afb) 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>
-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 fc1e6bdd08..ee476c468f 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('"')