From 8b64517f1b3c4e46d2080c312243f96a6ac03366 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 5 Jun 2020 22:20:22 +0200 Subject: [PATCH] build: target_config_check: make check more lenient Always allow options set to builtin (=y) when modular setting (=m) is expected. This can happen when a package is added explicitly (in a target defintion or site.mk) that is also pulled in as a dependency of another builtin package. Fixes: 9e23534ec365 ("build: rework config generation") Fixes: #2046 --- scripts/target_config_check.lua | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/target_config_check.lua b/scripts/target_config_check.lua index 9be50585..373a650e 100755 --- a/scripts/target_config_check.lua +++ b/scripts/target_config_check.lua @@ -9,18 +9,26 @@ local function fail(msg) io.stderr:write(' * ', msg, '\n') end -local function match_config(f) - for line in io.lines('openwrt/.config') do - if f(line) then - return true - end +local function match_config(expected, actual) + if expected == actual then + return true + end + + if expected:gsub('=m$', '=y') == actual then + return true end return false end local function check_config(config) - return match_config(function(line) return line == config end) + for line in io.lines('openwrt/.config') do + if match_config(config, line) then + return true + end + end + + return false end