Skip to contentSkip to conversation

- patch-kernel 2.4.18

PATCH In review Christopher A. Baumbauer 1 participant 2 messages Jun 20, 2002 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 - patch-kernel 2.4.18

Added support for patching in the pre-release patches (dept. of redundancy dept.) to the kernel tree. Nothing major, but along the same lines as the -ac patch option (also works the same way, except for using -pre instead). Finally, if there is a discussion, could you please cc me directly since I'm not on the list.

Ciao,
Chris Baumbauer

patch-kernel Thu Jun 20 00:45:25 2002 renamed from patch-kernel.orig Thu Jun 20 00:37:30 2002 +0 -0
@@ -1,6 +1,6 @@

#! /bin/sh
# Script to apply kernel patches.
-# usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] ] ]
+# usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] [ -prexx ] ] ]
# The source directory defaults to /usr/src/linux, and the patch
# directory defaults to the current directory.

# e.g.
@@ -41,18 +41,24 @@
# Added -ac option, use -ac or -ac9 (say) to stop at a particular version
#       Dave Gilbert <[email protected]>, 29th September 2001.

+# Added -pre option to work similar to the -ac option.
+# Chris Baumbauer <[email protected]>, 20th June 2002.
+
# Set directories from arguments, or use defaults. sourcedir=${1-/usr/src/linux}
patchdir=${2-.}
stopvers=${3-imnotaversion}

-# See if we have any -ac options
+# See if we have any -ac or -pre options
for PARM in $*
do
case $PARM in

      -ac*)
          gotac=$PARM;

-
+ ;;
+ -pre*)
+ gotpre=$PARM;

+          ;;
    esac;

done

@@ -188,6 +194,50 @@

        }
        applyPatch patch-${CURRENTFULLVERSION}${gotac}
    fi

+elif [ x$gotpre != x ]; then
+ # Living dangerously with the -pre patches
+ # I know this is a direct rip from the -ac code, but it should be the same: in theory +
+ # Lets determine if this is our first -pre patch or if we've already included some in the past
+ if [ -f $patchdir/patch-${CURRENTFULLVERSION}-pre*\.* ]
+ then
+ PREVERSION=$CURRENTFULLVERSION
+ else
+ PREVERSION=$FULLVERSION
+ fi
+

+    # They could have done -pre (get latest) or -prexx where xx=version they want
+    if [ $gotpre == "-pre" ]
+    then
+      # They want the latest version
+        HIGHESTPATCH=0
+        for PATCHNAMES in $patchdir/patch-${PREVERSION}-pre*\.*
+        do
+            ACVALUE=`echo $PATCHNAMES | sed -e 's/^.*patch-[0-9.]*-pre\([0-9]*\).*/\1/'`
+            # Check it is actually a recognised patch type
+            findFile $patchdir/patch-${PREVERSION}-pre${ACVALUE} || break

+
+ if [ $ACVALUE -gt $HIGHESTPATCH ]
+ then
+ HIGHESTPATCH=$ACVALUE
+ fi
+ done
+
+ if [ $HIGHESTPATCH -ne 0 ]
+ then
+ findFile $patchdir/patch-${PREVERSION}-pre${HIGHESTPATCH} || break
+ applyPatch patch-${PREVERSION}-pre${HIGHESTPATCH}
+ else
+ echo "No pre release patches found"
+ fi
+ else
+ # They want an exact version
+ findFile $patchdir/patch-${PREVERSION}${gotpre} || {
+ echo "Sorry, I couldn't find the $gotpre patch for $PREVERSION. Hohum."
+ exit 1
+ }
+ applyPatch patch-${PREVERSION}${gotpre}
+ fi
fi

Signature · 6 lines
-------
Christopher A. Baumbauer
[email protected], [email protected]

There are 10 types of people in the world:
Those who understand binary, and those who don't

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

Grr, it showed up fine before I sent it (fameous last words), but I'll attempt to resend it.

Thanks,
Chris

Quoted 14 lines · Rolf Eike Beer

Von Christopher A. Baumbauer:

Quoted 4 lines

-# usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx
] ] ]

I don't think that this will work, your mailer did his own line breaks!

Eike

Signature · 6 lines
-------
Christopher A. Baumbauer
[email protected], [email protected]

There are 10 types of people in the world:
Those who understand binary, and those who don't
patch-kernel renamed from patch-kernel.orig +53 -3
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Script to apply kernel patches.
-#   usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] ] ]
+#   usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] [ -prexx ] ] ]
 #     The source directory defaults to /usr/src/linux, and the patch
 #     directory defaults to the current directory.
 # e.g.
@@ -41,18 +41,24 @@
 # Added -ac option, use -ac or -ac9 (say) to stop at a particular version
 #       Dave Gilbert <[email protected]>, 29th September 2001.
 
+# Added -pre option to work similar to the -ac option.
+#	Chris Baumbauer <[email protected]>, 20th June 2002.
+
 # Set directories from arguments, or use defaults.
 sourcedir=${1-/usr/src/linux}
 patchdir=${2-.}
 stopvers=${3-imnotaversion}
 
-# See if we have any -ac options
+# See if we have any -ac or -pre options
 for PARM in $*
 do
   case $PARM in
 	  -ac*)
 		  gotac=$PARM;
-
+		  ;;
+	  -pre*)
+		  gotpre=$PARM;
+		  ;;
 	esac;
 done
 
@@ -188,6 +194,50 @@
 		}
 		applyPatch patch-${CURRENTFULLVERSION}${gotac}
 	fi
+elif [ x$gotpre != x ]; then
+  # Living dangerously with the -pre patches
+  # I know this is a direct rip from the -ac code, but it should be the same: in theory
+
+        # Lets determine if this is our first -pre patch or if we've already included some in the past
+        if [ -f $patchdir/patch-${CURRENTFULLVERSION}-pre*\.* ]
+	  then
+	      PREVERSION=$CURRENTFULLVERSION
+	else
+	      PREVERSION=$FULLVERSION
+	fi
+
+	# They could have done -pre (get latest) or -prexx where xx=version they want
+	if [ $gotpre == "-pre" ]
+	then
+	  # They want the latest version
+		HIGHESTPATCH=0
+		for PATCHNAMES in $patchdir/patch-${PREVERSION}-pre*\.*
+		do
+			ACVALUE=`echo $PATCHNAMES | sed -e 's/^.*patch-[0-9.]*-pre\([0-9]*\).*/\1/'`
+			# Check it is actually a recognised patch type
+			findFile $patchdir/patch-${PREVERSION}-pre${ACVALUE} || break
+
+		  if [ $ACVALUE -gt $HIGHESTPATCH ]
+			then
+			  HIGHESTPATCH=$ACVALUE
+		  fi
+		done
+
+		if [ $HIGHESTPATCH -ne 0 ]
+		then
+			findFile $patchdir/patch-${PREVERSION}-pre${HIGHESTPATCH} || break
+			applyPatch patch-${PREVERSION}-pre${HIGHESTPATCH}
+		else
+		  echo "No pre release patches found"
+		fi
+	else
+	  # They want an exact version
+		findFile $patchdir/patch-${PREVERSION}${gotpre} || {
+		  echo "Sorry, I couldn't find the $gotpre patch for $PREVERSION.  Hohum."
+			exit 1
+		}
+		applyPatch patch-${PREVERSION}${gotpre}
+	fi
 fi