[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bug in patch ? [was Re: packet-0.0.2j]
From: |
Eli Zaretskii |
Subject: |
Re: bug in patch ? [was Re: packet-0.0.2j] |
Date: |
Mon, 30 Apr 2001 12:16:19 +0300 (IDT) |
On Mon, 30 Apr 2001, Adam wrote:
> Hello, could it possibly be a bug in patch?
>
> it seems that few files ( drivers/block/Makefile, drivers/block/pktcdvd.c,
> drivers/cdrom/Makefile, and include/linux/pktcdvd.h ) are dumped into
> root dir of sources instad of their respective sub-directory.
>
> The patch is from
> ftp://ftp.kernel.org/pub/linux/kernel/people/axboe/packet/packet-0.0.2j.tar.gz
> and it is against linux 2.4.4 kernel sources
> ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.4.tar.gz
>
> and here's example one line which was parsed correctly, and one which was
> not.
>
> Any ideas?
>
> diff -urN --exclude-from /home/axboe/exclude
> /opt/kernel/linux-2.4.4/drivers/block/Config.in linux/drivers/block/Config.in
> --- /opt/kernel/linux-2.4.4/drivers/block/Config.in Sat Feb 3 21:13:19
> 2001
> +++ linux/drivers/block/Config.in Mon Apr 23 18:49:56 2001
These patches violate the advice in Patch man page, which says:
If the recipient is supposed to use the -pN option, do not
send output that looks like this:
diff -Naur v2.0.29/prog/README prog/README
--- v2.0.29/prog/README Mon Mar 10 15:13:12 1997
+++ prog/README Mon Mar 17 14:58:22 1997
because the two file names have different numbers of
slashes, and different versions of patch interpret the file
names differently. To avoid confusion, send output that
looks like this instead:
diff -Naur v2.0.29/prog/README v2.0.30/prog/README
--- v2.0.29/prog/README Mon Mar 10 15:13:12 1997
+++ v2.0.30/prog/README Mon Mar 17 14:58:22 1997