LU-20 build: fix confirmpatches, remove old patches

[fs/lustre-release.git] / build / confirmpatches.sh

diff --git a/build/confirmpatches.sh b/build/confirmpatches.sh
old mode 100644 (file)
new mode 100755 (executable)
index 1c160da..7e33291
--- a/build/confirmpatches.sh
+++ b/build/confirmpatches.sh
@@ -1,12 +1,22 @@
+#!/bin/bash
+PROG=$(basename $0)
+[ "$1" = "-h" -o "$1" = "--help" ] && echo "usage: $PROG [patch dir]" && exit 0
+[ "$1" = "-v" ] && shift && VERBOSE="echo" || VERBOSE=":"
+
 BASEDIR=${BASEDIR:-lustre/kernel_patches}
 SERIESPATH=${SERIESPATH:-$BASEDIR/series}
-PATCHESPATH=${PATCHESPATH:-$BASEDIR/patches}
-for SERIES in `ls $SERIESPATH | egrep -v "CVS|~$|.orig"` ; do
-       #echo $SERIES
-       for PATCH in `cat $SERIESPATH/$SERIES`; do
-               #echo $PATCH
-               if [ ! `find $PATCHESPATH -name $PATCH` ]; then
-                       echo "$SERIESPATH/$SERIES: patch $PATCH was not found !"
+PATCHPATH=${PATCHPATH:-$BASEDIR/patches}
+
+[ ! -d "$BASEDIR" ] && echo "$PROG: missing base directory '$BASEDIR'" && exit 1
+[ ! -d "$SERIESPATH" ] && echo "$PROG: missing series '$SERIESPATH'" && exit 2
+[ ! -d "$PATCHPATH" ] && echo "$PROG: missing patches '$PATCHPATH'" && exit 3
+
+for SERIES in $(ls $SERIESPATH | egrep -v "CVS|~$|.orig") ; do
+       $VERBOSE "series: $SERIES"
+       for PATCH in $(grep -v "^#" $SERIESPATH/$SERIES); do
+               $VERBOSE $PATCH
+               if [ ! $(find $PATCHPATH -name $PATCH) ]; then
+                       echo "$SERIESPATH/$SERIES: patch '$PATCH' not found!"
                fi
        done
 done