Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9875c42d authored by John Stultz's avatar John Stultz Committed by Michal Marek
Browse files

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: default avatarJohn Stultz <john.stultz@linaro.org>
Acked-by: default avatarDarren Hart <dvhart@linux.intel.com>
Acked-by: default avatarBruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 55cae304

scripts/kconfig/merge_config.sh

+9 −0
Original line number Diff line number Diff line
@@ -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