aboutsummaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle <arnout@mind.be>2017-07-21 03:05:30 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-07-25 23:07:03 +0200
commitde46cc9be0873fbd60b19552c5687ad142aa0c99 (patch)
tree2e82720e731a8c7a629ce3d0136e016f45e8598a /utils
parentdab80981d15979eab3aea28a33694396635a52a1 (diff)
downloadbuildroot-de46cc9be0873fbd60b19552c5687ad142aa0c99.tar.gz
buildroot-de46cc9be0873fbd60b19552c5687ad142aa0c99.tar.bz2
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>
Diffstat (limited to 'utils')
-rwxr-xr-xutils/test-pkg8
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