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

Commit 07584163 authored by Erkki Lintunen's avatar Erkki Lintunen Committed by Sam Ravnborg
Browse files

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 7a48bdd0

scripts/patch-kernel

+2 −1
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ fi 
if [ $stopvers != "default" ]; then

	STOPSUBLEVEL=`echo $stopvers | cut -d. -f3`

	STOPEXTRA=`echo $stopvers | cut -d. -f4`

	STOPFULLVERSION=${stopvers%%.$STOPEXTRA}

	#echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/"

else

	STOPSUBLEVEL=9999
@@ -249,7 +250,7 @@ while : # incrementing SUBLEVEL (s in v.p.s) 
do

    CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"

    EXTRAVER=

    if [ $stopvers = $CURRENTFULLVERSION ]; then

    if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then

        echo "Stopping at $CURRENTFULLVERSION base as requested."

        break

    fi