@@ -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
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> --- v6: Rebased v5: First version --- support/scripts/test-pkg | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)