From cd5d65a83f1c1b6458f456b9f76ecfcf91cc325d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 10 Dec 2013 19:38:26 +0000 Subject: 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 ] (From OE-Core rev: b226ab4cf7779f4dfaa78210cb6249766ed564c1) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index a51f504..e77e993 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: -- cgit v1.1