History

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.

Erkki Lintunen committed 18 years ago

Commit 07584161 parent 7a48bdd1 file · +2 −1Browse files

Showing the changes to scripts/patch-kernel (1 of 1 file). Show all

Unified · Split

scripts/patch-kernel+2−1
@@ -213,6 +213,7 @@ fi · 212 unmodified lines
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) · 30 unmodified lines
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