Merge git://github.com/Paragon-Software-Group/linux-ntfs3

[linux-2.6-microblaze.git] / scripts / kconfig / merge_config.sh

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 63c8565..e5b4698 100755 (executable)
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -28,6 +28,7 @@ usage() {
        echo "  -r    list redundant entries when merging fragments"
        echo "  -y    make builtin have precedence over modules"
        echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
+       echo "  -s    strict mode. Fail if the fragment redefines any value."
        echo
        echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
 }
@@ -37,6 +38,7 @@ ALLTARGET=alldefconfig
 WARNREDUN=false
 BUILTIN=false
 OUTPUT=.
+STRICT=false
 CONFIG_PREFIX=${CONFIG_-CONFIG_}
 
 while true; do
@@ -75,6 +77,11 @@ while true; do
                shift 2
                continue
                ;;
+       "-s")
+               STRICT=true
+               shift
+               continue
+               ;;
        *)
                break
                ;;
@@ -141,6 +148,9 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
                        echo Previous  value: $PREV_VAL
                        echo New value:       $NEW_VAL
                        echo
+                       if [ "$STRICT" = "true" ]; then
+                               STRICT_MODE_VIOLATED=true
+                       fi
                elif [ "$WARNREDUN" = "true" ]; then
                        echo Value of $CFG is redundant by fragment $ORIG_MERGE_FILE:
                fi
@@ -153,6 +163,11 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do
        cat $MERGE_FILE >> $TMP_FILE
 done
 
+if [ "$STRICT_MODE_VIOLATED" = "true" ]; then
+       echo "The fragment redefined a value and strict mode had been passed."
+       exit 1
+fi
+
 if [ "$RUNMAKE" = "false" ]; then
        cp -T -- "$TMP_FILE" "$KCONFIG_CONFIG"
        echo "#"