All of lore.kernel.org
 help / color / mirror / Atom feed
* bugfix for scripts/patch-kernel in 2.6 sublevel stepping
@ 2008-08-03 21:00 Erkki Lintunen
  2008-08-03 22:00 ` Randy.Dunlap
  0 siblings, 1 reply; 2+ messages in thread
From: Erkki Lintunen @ 2008-08-03 21:00 UTC (permalink / raw)
  To: rdunlap; +Cc: linux-kernel


Hi,

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. Following patch has a fix for it.

Erkki

--- linux-2.6.26/scripts/patch-kernel   2008-04-27 19:49:14.000000000 +0300
+++ linux-2.6.26.1/scripts/patch-kernel 2008-08-03 23:34:00.000000000 +0300
@@ -213,6 +213,7 @@
  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 @@
  do
      CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
      EXTRAVER=
-    if [ $stopvers = $CURRENTFULLVERSION ]; then
+    if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
          echo "Stopping at $CURRENTFULLVERSION base as requested."
          break
      fi


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: bugfix for scripts/patch-kernel in 2.6 sublevel stepping
  2008-08-03 21:00 bugfix for scripts/patch-kernel in 2.6 sublevel stepping Erkki Lintunen
@ 2008-08-03 22:00 ` Randy.Dunlap
  0 siblings, 0 replies; 2+ messages in thread
From: Randy.Dunlap @ 2008-08-03 22:00 UTC (permalink / raw)
  To: Erkki Lintunen; +Cc: rdunlap, akpm, linux-kernel

On Mon, 4 Aug 2008, Erkki Lintunen wrote:

> 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. Following
> patch has a fix for it.
> 
> Erkki

Hi,

This does work better than the current script in the kernel tree.

The larger question:  is does anyone still use this script?

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>


Andrew, please merge.


> --- linux-2.6.26/scripts/patch-kernel   2008-04-27 19:49:14.000000000 +0300
> +++ linux-2.6.26.1/scripts/patch-kernel 2008-08-03 23:34:00.000000000 +0300
> @@ -213,6 +213,7 @@
>  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 @@
>  do
>      CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
>      EXTRAVER=
> -    if [ $stopvers = $CURRENTFULLVERSION ]; then
> +    if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
>          echo "Stopping at $CURRENTFULLVERSION base as requested."
>          break
>      fi

-- 
~Randy

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-08-03 22:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-03 21:00 bugfix for scripts/patch-kernel in 2.6 sublevel stepping Erkki Lintunen
2008-08-03 22:00 ` Randy.Dunlap

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.