[PATCH] scripts/patch-kernel fix

[PATCH] scripts/patch-kernel fix

[Daniel Wisehart]

Takes care of errors when running something like:

$ ./scripts/patch-kernel . .. 3.5
Current kernel version is 3.5.0-rc7 ( Saber-toothed Squirrel)
./scripts/patch-kernel: line 229: [: -lt: unary operator expected
./scripts/patch-kernel: line 252: [: -gt: unary operator expected


diff --git a/scripts/patch-kernel b/scripts/patch-kernel
index d000ea3..a7672eb 100755
--- a/scripts/patch-kernel
+++ b/scripts/patch-kernel
@@ -226,7 +226,7 @@ fi
 
 # This all assumes a 2.6.x[.y] kernel tree.
 # Don't allow backwards/reverse patching.
-if [ $STOPSUBLEVEL -lt $SUBLEVEL ]; then
+if [ "$STOPSUBLEVEL"0 -lt "$SUBLEVEL"0 ]; then
        backwards
 fi
 
@@ -249,7 +249,7 @@ fi
 # If not ending sublevel is specified, it is incremented until
 # no further sublevels are found.
 
-if [ $STOPSUBLEVEL -gt $SUBLEVEL ]; then
+if [ "$STOPSUBLEVEL"0 -gt "$SUBLEVEL"0 ]; then
 while :                                # incrementing SUBLEVEL (s in v.p.s)
 do
     CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"



This communication is restricted - please see http://www.eladian.com for further information.

Re: [PATCH] scripts/patch-kernel fix

[Michal Marek]

On 19.7.2012 23:49, Daniel Wisehart wrote:
> diff --git a/scripts/patch-kernel b/scripts/patch-kernel
> index d000ea3..a7672eb 100755
> --- a/scripts/patch-kernel
> +++ b/scripts/patch-kernel
> @@ -226,7 +226,7 @@ fi
>  
>  # This all assumes a 2.6.x[.y] kernel tree.
>  # Don't allow backwards/reverse patching.
> -if [ $STOPSUBLEVEL -lt $SUBLEVEL ]; then
> +if [ "$STOPSUBLEVEL"0 -lt "$SUBLEVEL"0 ]; then

Hi Daniel,

While this is correct, it is not obvious at first sight why you need to
multiply the numbers by 10. Or at least it was not obvious to me :).
Could you use the more common idiom 0$NUMBER? The shell interprets the
numbers as decimal, so it's works fine.

Michal

Re: [PATCH] scripts/patch-kernel fix

[Jan Engelhardt]

On Thursday 2012-07-26 12:10, Michal Marek wrote:
>On 19.7.2012 23:49, Daniel Wisehart wrote:
>> diff --git a/scripts/patch-kernel b/scripts/patch-kernel
>> index d000ea3..a7672eb 100755
>> --- a/scripts/patch-kernel
>> +++ b/scripts/patch-kernel
>> @@ -226,7 +226,7 @@ fi
>>  
>>  # This all assumes a 2.6.x[.y] kernel tree.
>>  # Don't allow backwards/reverse patching.
>> -if [ $STOPSUBLEVEL -lt $SUBLEVEL ]; then
>> +if [ "$STOPSUBLEVEL"0 -lt "$SUBLEVEL"0 ]; then
>
>Hi Daniel,
>
>While this is correct, it is not obvious at first sight why you need to
>multiply the numbers by 10. Or at least it was not obvious to me :).

Word has it some really old shells nobody would use to compile Linux on
interpret "" not as an empty argument, but as a non-existing argument,
turning if [ "" != "" ] into essentially if [ != ].

Doing x10 avoids the uncertainity whether shells might attempt to
interpret it as octal or not.
So far the interpretation..

>Could you use the more common idiom 0$NUMBER? The shell interprets the
>numbers as decimal, so it's works fine.

Wonder what POSIX says about that.