diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-02-01 18:01:58 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-03-24 23:25:40 +0100 |
| commit | 09280615a0d924b3ab79acbff950f92c3420fd76 (patch) | |
| tree | e49fd169ac260000b4da49b8a39d929bf038378b /scripts | |
| parent | kconfig: fix new choices being skipped upon config update (diff) | |
| download | linux-09280615a0d924b3ab79acbff950f92c3420fd76.tar.xz linux-09280615a0d924b3ab79acbff950f92c3420fd76.zip | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/merge_config.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index ceadf0e150cf..23d738a1acda 100644 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -58,12 +58,16 @@ while true; do esac done - +INITFILE=$1 +shift; MERGE_LIST=$* SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p" TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) +echo "Using $INITFILE as base" +cat $INITFILE > $TMP_FILE + # Merge files, printing warnings on overrided values for MERGE_FILE in $MERGE_LIST ; do echo "Merging $MERGE_FILE" |