From: Tom Zanussi Date: Wed, 3 Jul 2013 20:13:34 +0000 (+0000) Subject: yocto-kernel: enforce exact match for BBLAYERS X-Git-Tag: rev_ivi_2015_02_04~11893 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c34d3f218f5a4536ddf9de366dbb9b0445cdc076;p=scm%2Fbb%2Ftizen-distro.git 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- 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('"')