On Sat, 23 Feb 2002 00:22, richard wrote:
> Hi all
>
>
> re:patching a diff file to the kernel
>
> I tried to patch and got this
> [root@fw-gb7tf linux-2.4.17-20mdk]# patch -n kernel-2.4.17-20mdk
That's not how you patch something!
You cd into the appropriate directory where your unpatched source is and then 
type "patch -p0 < netrom-2.4.17-20mdk.diff.patch".  Read up the manpage on 
patch with regards to -p0 because it's confusing (to me, anyway) and in this 
case, it's -p1.  Forget the -n (patch can figure it out by itself) and plus 
it's -u in this case since you have a unified patch, anyway.

> netrom-2.4.17-20mdk.diff patch: **** Only garbage was found in the patch
> input.
>
> The first lines of the patch is
>
> diff -ruN -X dontdiff linux-2.4.17-20mdk/net/netrom/af_netrom.c
> linux/net/netrom/af_netrom.c
> --- linux-2.4.17-20mdk/net/netrom/af_netrom.c   Tue Feb 19 16:06:42 2002
> +++ linux/net/netrom/af_netrom.c        Tue Feb 19 16:14:39 2002
> @@ -31,7 +31,9 @@
>   *     NET/ROM 007     Jonathan(G4KLX) New timer architecture.
>   *                                     Impmented Idle timer.
>   *                     Arnaldo C. Melo s/suser/capable/, micro cleanups
> - *                     Jeroen (PE1RXQ) Use sock_orphan() on release.
> + *                     Jeroen(PE1RXQ)  Use sock_orphan() on release.
> + *                     Tomi(OH2BNS)    Better frame type checking.
> + *                                     Device refcnt fixes.
>   */
>
> Am I right to use -n for the patch option ?
>
No, no, -u in this case (see the diff -u :).  And just leave it out anyway.

> and to apply the patch to the source code within the
> /usr/src/linux-2.4.17-20 directory   ?
>
cd /usr/src/linux-2.4.17-20
patch -p1 < netrom-2.4.17-20mdk.diff.patch.

pesarif

Want to buy your Pack or Services from MandrakeSoft? 
Go to http://www.mandrakestore.com

Reply via email to