diff options
author | Ross Burton <ross.burton@intel.com> | 2013-12-10 19:38:26 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-16 12:13:59 +0000 |
commit | cd5d65a83f1c1b6458f456b9f76ecfcf91cc325d (patch) | |
tree | 994059352d0371ef50e4256fd98ee025f85ba250 /meta/classes/insane.bbclass | |
parent | 8babb8ff1752a7815ae1780bdd6df4de51fd222b (diff) | |
download | poky-cd5d65a83f1c1b6458f456b9f76ecfcf91cc325d.tar.gz |
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 <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.bbclass | 6 |
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)) | |||
941 | try: | 941 | try: |
942 | flag = "WARNING: unrecognized options:" | 942 | flag = "WARNING: unrecognized options:" |
943 | log = os.path.join(d.getVar('B', True), 'config.log') | 943 | log = os.path.join(d.getVar('B', True), 'config.log') |
944 | output = subprocess.check_output(['grep', '-F', flag, log]) | 944 | output = subprocess.check_output(['grep', '-F', flag, log]).replace(', ', ' ') |
945 | options = set(map(lambda s: s.strip(' ,'), output.partition(flag)[2].split())) | 945 | options = set() |
946 | for line in output.splitlines(): | ||
947 | options |= set(line.partition(flag)[2].split()) | ||
946 | whitelist = set(d.getVar("UNKNOWN_CONFIGURE_WHITELIST", True).split()) | 948 | whitelist = set(d.getVar("UNKNOWN_CONFIGURE_WHITELIST", True).split()) |
947 | options -= whitelist | 949 | options -= whitelist |
948 | if options: | 950 | if options: |