summaryrefslogtreecommitdiff
path: root/meta/classes/insane.bbclass
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-10 19:38:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-16 12:12:40 +0000
commitb226ab4cf7779f4dfaa78210cb6249766ed564c1 (patch)
tree8c68f89ad49acb46dd16682bcb008de8f4f5f545 /meta/classes/insane.bbclass
parentd2bf599f36ed1a04c661fc0a71e664e219532cbc (diff)
downloadopenembedded-core-b226ab4cf7779f4dfaa78210cb6249766ed564c1.tar.gz
openembedded-core-b226ab4cf7779f4dfaa78210cb6249766ed564c1.tar.bz2
openembedded-core-b226ab4cf7779f4dfaa78210cb6249766ed564c1.zip
insane: handle recursive configures when checking for unknown configure options
Some recipes have configure scripts that recursively call other configure scripts (e.g. dropbear). These multiple-line matches were not being handled correctly, so iterate over every matching line instead of assuming only one line was found. [ YOCTO #5646 ] Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/insane.bbclass')
-rw-r--r--meta/classes/insane.bbclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index a51f504f20..e77e993325 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -941,8 +941,10 @@ Missing inherit gettext?""" % (gt, config))
try:
flag = "WARNING: unrecognized options:"
log = os.path.join(d.getVar('B', True), 'config.log')
- output = subprocess.check_output(['grep', '-F', flag, log])
- options = set(map(lambda s: s.strip(' ,'), output.partition(flag)[2].split()))
+ output = subprocess.check_output(['grep', '-F', flag, log]).replace(', ', ' ')
+ options = set()
+ for line in output.splitlines():
+ options |= set(line.partition(flag)[2].split())
whitelist = set(d.getVar("UNKNOWN_CONFIGURE_WHITELIST", True).split())
options -= whitelist
if options: