Skip to content

Commit 0758416

Browse files
lefiftysravnborg
authored andcommitted
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>
1 parent 7a48bdd commit 0758416

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

scripts/patch-kernel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ fi
213213
if [ $stopvers != "default" ]; then
214214
STOPSUBLEVEL=`echo $stopvers | cut -d. -f3`
215215
STOPEXTRA=`echo $stopvers | cut -d. -f4`
216+
STOPFULLVERSION=${stopvers%%.$STOPEXTRA}
216217
#echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/"
217218
else
218219
STOPSUBLEVEL=9999
@@ -249,7 +250,7 @@ while : # incrementing SUBLEVEL (s in v.p.s)
249250
do
250251
CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
251252
EXTRAVER=
252-
if [ $stopvers = $CURRENTFULLVERSION ]; then
253+
if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
253254
echo "Stopping at $CURRENTFULLVERSION base as requested."
254255
break
255256
fi

0 commit comments

Comments
 (0)