[PATCH] [TRIVIAL] README: patch -p1, remove make dep

[PATCH] [TRIVIAL] README: patch -p1, remove make dep

[Petri Koistinen]

Hello!

Either I am doing all wrong, but I think you need to use -p1 to apply 
patches. Make dep is unnecessary now.

Best regards,
Petri Koistinen

--- linux-2.5.62/README.orig	2003-02-18 20:27:00.000000000 +0200
+++ linux-2.5.62/README	2003-02-18 20:27:20.000000000 +0200
@@ -69,10 +69,10 @@
    install by patching, get all the newer patch files, enter the
    directory in which you unpacked the kernel source and execute:
 
-		gzip -cd patchXX.gz | patch -p0
+		gzip -cd patchXX.gz | patch -p1
 
    or
-		bzip2 -dc patchXX.bz2 | patch -p0
+		bzip2 -dc patchXX.bz2 | patch -p1
 
    (repeat xx for all versions bigger than the version of your current
    source tree, _in_order_) and you should be ok.  You may want to remove
@@ -149,8 +149,6 @@
  - Check the top Makefile for further site-dependent configuration
    (default SVGA mode etc). 
 
- - Finally, do a "make dep" to set up all the dependencies correctly. 
-
 COMPILING the kernel:
 
  - Make sure you have gcc 2.95.3 available.

Re: [PATCH] [TRIVIAL] README: patch -p1, remove make dep

[Tim Schmielau]

> Either I am doing all wrong, but I think you need to use -p1 to apply
> patches. Make dep is unnecessary now.

No, you do it right;-) The instructions seem to be a leftover from the
time when Linus named the kernel directory linux/ (as opposed to
linux-2.5.xx).

> --- linux-2.5.62/README.orig	2003-02-18 20:27:00.000000000 +0200
> +++ linux-2.5.62/README	2003-02-18 20:27:20.000000000 +0200
> @@ -69,10 +69,10 @@
>     install by patching, get all the newer patch files, enter the
>     directory in which you unpacked the kernel source and execute:
>
> -		gzip -cd patchXX.gz | patch -p0
> +		gzip -cd patchXX.gz | patch -p1
>
>     or
> -		bzip2 -dc patchXX.bz2 | patch -p0
> +		bzip2 -dc patchXX.bz2 | patch -p1
>
>     (repeat xx for all versions bigger than the version of your current
>     source tree, _in_order_) and you should be ok.  You may want to remove

However, your patch gets us only half-way to correct instructions,
since for 'patch -p1' one also needs to cd into the kernel directory.
E.g., something like

     install by patching, get all the newer patch files, enter the
     top level directory of the kernel source (the one named
     linux-2.xx.yy) and execute:

               gzip -cd ../patchXX.gz | patch -p1
     or
               bzip2 -dc ../patchXX.bz2 | patch -p1

     (repeat xx for all versions bigger than the version of your current
     source tree, _in_order_) and you should be ok. Don't forget to rename
     the kernel directory to linux-2.xx.zz where zz is the number of the
     lates patch you applied.

may be better?

Tim

Re: [PATCH] [TRIVIAL] README: patch -p1, remove make dep

[Petri Koistinen]

On Tue, 18 Feb 2003, Tim Schmielau wrote:

> However, your patch gets us only half-way to correct instructions,

Ok, how about this?

Petri

--- linux-2.5.62/README.orig	2003-02-18 20:27:00.000000000 +0200
+++ linux-2.5.62/README	2003-02-19 00:34:41.000000000 +0200
@@ -67,12 +67,12 @@
  - You can also upgrade between 2.5.xx releases by patching.  Patches are
    distributed in the traditional gzip and the new bzip2 format.  To
    install by patching, get all the newer patch files, enter the
-   directory in which you unpacked the kernel source and execute:
+   top level directory of the kernel source (linux-2.5.xx) and execute:
 
-		gzip -cd patchXX.gz | patch -p0
+		gzip -cd ../patch-2.5.xx.gz | patch -p1
 
    or
-		bzip2 -dc patchXX.bz2 | patch -p0
+		bzip2 -dc ../patch-2.5.xx.bz2 | patch -p1
 
    (repeat xx for all versions bigger than the version of your current
    source tree, _in_order_) and you should be ok.  You may want to remove
@@ -149,8 +149,6 @@
  - Check the top Makefile for further site-dependent configuration
    (default SVGA mode etc). 
 
- - Finally, do a "make dep" to set up all the dependencies correctly. 
-
 COMPILING the kernel:
 
  - Make sure you have gcc 2.95.3 available.

Re: [PATCH] [TRIVIAL] README: patch -p1, remove make dep

[Tim Schmielau]

On Wed, 19 Feb 2003, Petri Koistinen wrote:

> On Tue, 18 Feb 2003, Tim Schmielau wrote:
>
> > However, your patch gets us only half-way to correct instructions,
>
> Ok, how about this?
>
> Petri
>
> --- linux-2.5.62/README.orig	2003-02-18 20:27:00.000000000 +0200
> +++ linux-2.5.62/README	2003-02-19 00:34:41.000000000 +0200
> @@ -67,12 +67,12 @@
>   - You can also upgrade between 2.5.xx releases by patching.  Patches are
>     distributed in the traditional gzip and the new bzip2 format.  To
>     install by patching, get all the newer patch files, enter the
> -   directory in which you unpacked the kernel source and execute:
> +   top level directory of the kernel source (linux-2.5.xx) and execute:
>
> -		gzip -cd patchXX.gz | patch -p0
> +		gzip -cd ../patch-2.5.xx.gz | patch -p1
>
>     or
> -		bzip2 -dc patchXX.bz2 | patch -p0
> +		bzip2 -dc ../patch-2.5.xx.bz2 | patch -p1
>
>     (repeat xx for all versions bigger than the version of your current
>     source tree, _in_order_) and you should be ok.  You may want to remove
> @@ -149,8 +149,6 @@
>   - Check the top Makefile for further site-dependent configuration
>     (default SVGA mode etc).
>
> - - Finally, do a "make dep" to set up all the dependencies correctly.
> -
>  COMPILING the kernel:
>
>   - Make sure you have gcc 2.95.3 available.
>
>

This looks good to me.

Tim