[Buildroot] [PATCH v6 9/9] support/test-pkg: use merge_config.sh to merge the fragments
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Fri Apr 7 11:16:24 UTC 2017
It is supposedly more robust than just concatenating.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Cc: Yann E. MORIN <yann.morin.1998 at free.fr>
---
v6: Rebased
v5: First version
---
support/scripts/test-pkg | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/support/scripts/test-pkg b/support/scripts/test-pkg
index 2ac7aefac7..9ce01a3125 100755
--- a/support/scripts/test-pkg
+++ b/support/scripts/test-pkg
@@ -98,13 +98,11 @@ build_one() {
local pkg="${4}"
mkdir -p "${dir}"
-
- cat "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" >>"${dir}/.config"
+ support/kconfig/merge_config.sh -O "${dir}" \
+ "${toolchainconfig}" "support/config-fragments/minimal.config" "${cfg}" \
+ > /dev/null
- if ! make O="${dir}" olddefconfig > "${dir}/logfile" 2>&1; then
- return 2
- fi
# 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
--
2.11.0
More information about the buildroot
mailing list