diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/test-pkg | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/utils/test-pkg b/utils/test-pkg index 8c60649b32..f951eda563 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -94,11 +94,9 @@ build_one() { mkdir -p "${dir}" - cat "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" >>"${dir}/.config" - - if ! make O="${dir}" olddefconfig > "${dir}/logfile" 2>&1; then - return 2 - fi + support/kconfig/merge_config.sh -O "${dir}" \ + "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \ + > /dev/null # We want all the options from the snippet to be present as-is (set # or not set) in the actual .config; if one of them is not, it means # some dependency from the toolchain or arch is not available, in |
