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>
This commit is contained in:
John Stultz 2012-03-23 12:52:08 -07:00 коммит произвёл Michal Marek
Родитель 55cae3043a
Коммит 9875c42d69
1 изменённых файлов: 9 добавлений и 0 удалений

Просмотреть файл

@ -31,10 +31,12 @@ usage() {
echo " -h display this help text" echo " -h display this help text"
echo " -m only merge the fragments, do not execute the make command" echo " -m only merge the fragments, do not execute the make command"
echo " -n use allnoconfig instead of alldefconfig" echo " -n use allnoconfig instead of alldefconfig"
echo " -r list redundant entries when merging fragments"
} }
MAKE=true MAKE=true
ALLTARGET=alldefconfig ALLTARGET=alldefconfig
WARNREDUN=false
while true; do while true; do
case $1 in case $1 in
@ -52,6 +54,11 @@ while true; do
usage usage
exit exit
;; ;;
"-r")
WARNREDUN=true
shift
continue
;;
*) *)
break break
;; ;;
@ -83,6 +90,8 @@ for MERGE_FILE in $MERGE_LIST ; do
echo Previous value: $PREV_VAL echo Previous value: $PREV_VAL
echo New value: $NEW_VAL echo New value: $NEW_VAL
echo echo
elif [ "$WARNREDUN" = "true" ]; then
echo Value of $CFG is redundant by fragment $MERGE_FILE:
fi fi
sed -i "/$CFG[ =]/d" $TMP_FILE sed -i "/$CFG[ =]/d" $TMP_FILE
fi fi