merge_config.sh: Use the first file as the initial config
Take the first config fragment and use it verbatim as the initial config set. This avoids running the verification loop for the first file, as nothing has actually been merged at this point. This significantly increases performance for large config fragments. Signed-off-by: Josh Boyer <jwboyer@redhat.com> Acked-by: John Stultz <john.stultz@linaro.org> Acked-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Родитель
5d09598d48
Коммит
09280615a0
|
@ -58,12 +58,16 @@ while true; do
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
|
INITFILE=$1
|
||||||
|
shift;
|
||||||
|
|
||||||
MERGE_LIST=$*
|
MERGE_LIST=$*
|
||||||
SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
|
SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
|
||||||
TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
|
TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
|
||||||
|
|
||||||
|
echo "Using $INITFILE as base"
|
||||||
|
cat $INITFILE > $TMP_FILE
|
||||||
|
|
||||||
# Merge files, printing warnings on overrided values
|
# Merge files, printing warnings on overrided values
|
||||||
for MERGE_FILE in $MERGE_LIST ; do
|
for MERGE_FILE in $MERGE_LIST ; do
|
||||||
echo "Merging $MERGE_FILE"
|
echo "Merging $MERGE_FILE"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче