test-pkg: use merge_config.sh to merge the fragments

It is supposedly more robust than just concatenating.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/utils/test-pkg b/utils/test-pkg
index 8c60649b32669ac4a52961cf92cccd8a6a8db22e..f951eda563a5dca6c0cae075daaa5c92a3ab3926 100755 (executable)
--- 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