[OE-core] [PATCH] insane: handle recursive configures when checking for unknown configure options
Ross Burton
ross.burton at intel.com
Tue Dec 10 19:38:26 UTC 2013
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 at intel.com>
---
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:
--
1.7.10.4
More information about the Openembedded-core
mailing list