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>
This commit is contained in:
parent
8babb8ff17
commit
cd5d65a83f
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue