Skip to content

target: accept any CONFIG_*=<value> inline fragment#277

Merged
roxell merged 1 commit into
kernelci:masterfrom
bhcopeland:kconfig-permissive-inline-fragment
Apr 22, 2026
Merged

target: accept any CONFIG_*=<value> inline fragment#277
roxell merged 1 commit into
kernelci:masterfrom
bhcopeland:kconfig-permissive-inline-fragment

Conversation

@bhcopeland
Copy link
Copy Markdown
Member

The old regex only matched =y/=m/=n and "is not set" lines. That misses a lot of real config: =1 and =0 are common for bools (kselftest's tools/testing/selftests/bpf/config uses =1 for
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC), and fragments can also include hex, string, and int symbols.

tuxmake was rejecting those as "Unsupported kconfig fragment" even though they work fine once they hit olddefconfig.

Let kconfig handle validation. merge_config.sh and olddefconfig already know each symbol's type and print a reasonable error when the value is wrong, so there's no point replicating that here. Keep the two shapes ("CONFIG_X=..." and "# CONFIG_X is not set") so pure junk still gets caught.

The old regex only matched =y/=m/=n and "is not set" lines. That misses
a lot of real config: =1 and =0 are common for bools (kselftest's
tools/testing/selftests/bpf/config uses =1 for
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC), and fragments can also include hex,
string, and int symbols.

tuxmake was rejecting those as "Unsupported kconfig fragment" even
though they work fine once they hit olddefconfig.

Let kconfig handle validation. merge_config.sh and olddefconfig already
know each symbol's type and print a reasonable error when the value is
wrong, so there's no point replicating that here. Keep the two shapes
("CONFIG_X=..." and "# CONFIG_X is not set") so pure junk still gets
caught.

Signed-off-by: Ben Copeland <ben.copeland@linaro.org>
@bhcopeland bhcopeland force-pushed the kconfig-permissive-inline-fragment branch from b838fe4 to 6ea7dfb Compare April 22, 2026 06:55
@roxell roxell merged commit d54c423 into kernelci:master Apr 22, 2026
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants