On 03/23/2012 12:52 PM, John Stultz wrote: > 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. > > v2: > Now w/ spelling fixes! Thanks Darren! > > CC: Michal Marek <mmarek@xxxxxxx> > CC: Bruce.Ashfield@xxxxxxxxxxxxx > CC: Darren Hart <dvhart@xxxxxxxxxxxxxxx> > Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx> Acked-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx> > --- > 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 ceadf0e..ad8c76e 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 > ;; > @@ -79,6 +86,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 -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html