diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-03-23 12:52:08 -0700 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-03-30 15:14:47 +0200 |
| commit | 9875c42d6979a7db0b8d217e2a88095b753f482c (patch) | |
| tree | 065ae9f46754f7719a9b2b2a932bd94fe0aa0031 /scripts | |
| parent | 55cae3043a48e01f8fc31e8aecc3062c4767a27d (diff) | |
| download | linux-3.10-9875c42d6979a7db0b8d217e2a88095b753f482c.tar.gz linux-3.10-9875c42d6979a7db0b8d217e2a88095b753f482c.tar.bz2 linux-3.10-9875c42d6979a7db0b8d217e2a88095b753f482c.zip | |
merge_config.sh: Add option to display redundant configs
Provide a -r option to display when fragments contain redundant
options. This is really useful when breaking apart a config into
fragments, as well as cleaning up older fragments.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/kconfig/merge_config.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 23d738a1acd..974d5cb7e30 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -31,10 +31,12 @@ usage() { echo " -h display this help text" echo " -m only merge the fragments, do not execute the make command" echo " -n use allnoconfig instead of alldefconfig" + echo " -r list redundant entries when merging fragments" } MAKE=true ALLTARGET=alldefconfig +WARNREDUN=false while true; do case $1 in @@ -52,6 +54,11 @@ while true; do usage exit ;; + "-r") + WARNREDUN=true + shift + continue + ;; *) break ;; @@ -83,6 +90,8 @@ for MERGE_FILE in $MERGE_LIST ; do echo Previous value: $PREV_VAL echo New value: $NEW_VAL echo + elif [ "$WARNREDUN" = "true" ]; then + echo Value of $CFG is redundant by fragment $MERGE_FILE: fi sed -i "/$CFG[ =]/d" $TMP_FILE fi |