bugfix for scripts/patch-kernel in 2.6 sublevel stepping

scripts/patch-kernel script can't patch a tree, say, from 2.6.25 to
2.6.26.1, because of a wrong comparison in context of patching 2.6.x base.
 Fix it.

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Erkki Lintunen 2008-08-06 22:11:33 +02:00 committed by Sam Ravnborg
parent 7a48bdd01b
commit 0758416325

View File

@ -213,6 +213,7 @@ fi
if [ $stopvers != "default" ]; then if [ $stopvers != "default" ]; then
STOPSUBLEVEL=`echo $stopvers | cut -d. -f3` STOPSUBLEVEL=`echo $stopvers | cut -d. -f3`
STOPEXTRA=`echo $stopvers | cut -d. -f4` STOPEXTRA=`echo $stopvers | cut -d. -f4`
STOPFULLVERSION=${stopvers%%.$STOPEXTRA}
#echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/" #echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/"
else else
STOPSUBLEVEL=9999 STOPSUBLEVEL=9999
@ -249,7 +250,7 @@ while : # incrementing SUBLEVEL (s in v.p.s)
do do
CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL" CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
EXTRAVER= EXTRAVER=
if [ $stopvers = $CURRENTFULLVERSION ]; then if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
echo "Stopping at $CURRENTFULLVERSION base as requested." echo "Stopping at $CURRENTFULLVERSION base as requested."
break break
fi fi