jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnout Vandecappelle 2017-07-21 03:05:30 +02:00 committed by Thomas Petazzoni
parent dab80981d1
commit de46cc9be0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/test-pkg
View File

@ -94,11 +94,9 @@ build_one() {
mkdir -p "${dir}" 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}" \
if ! make O="${dir}" olddefconfig > "${dir}/logfile" 2>&1; then > /dev/null
return 2
fi
# We want all the options from the snippet to be present as-is (set # 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 # 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 # some dependency from the toolchain or arch is not available, in