bug in patch ? [was Re: packet-0.0.2j]

[Adam]

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

diff -urN --exclude-from /home/axboe/exclude  
/opt/kernel/linux-2.4.4/drivers/block/Makefile linux/drivers/block/Makefile
--- /opt/kernel/linux-2.4.4/drivers/block/Makefile      Fri Dec 29  23:07:21 
2000
+++ linux/drivers/block/Makefile        Sat Apr 28 00:29:06 2001

address@hidden linux]# cat /usr/src/CD-RW/packet/packet-0.0.2j/packet-0.0.2j
| patch -p4
patching file `Documentation/Configure.help'
patching file `arch/sparc64/kernel/ioctl32.c'
patching file `drivers/block/Config.in'
patching file `Makefile'
Hunk #1 FAILED at 10.
Hunk #2 FAILED at 29.
2 out of 2 hunks FAILED -- saving rejects to Makefile.rej
patching file `drivers/block/elevator.c'
patching file `drivers/block/ll_rw_blk.c'
patching file `pktcdvd.c'
patching file `Makefile'
Hunk #1 FAILED at 27.
1 out of 1 hunk FAILED -- saving rejects to Makefile.rej
patching file `drivers/cdrom/cdrom.c'
patching file `drivers/char/sysrq.c'
patching file `drivers/ide/ide-cd.c'
patching file `drivers/ide/ide-cd.h'
patching file `drivers/scsi/Config.in'
patching file `drivers/scsi/scsi_lib.c'
patching file `drivers/scsi/scsi_merge.c'
patching file `drivers/scsi/sr.c'
patching file `drivers/scsi/sr.h'
patching file `drivers/scsi/sr_ioctl.c'
patching file `drivers/scsi/sr_vendor.c'
patching file `fs/buffer.c'
patching file `include/linux/blkdev.h'
patching file `include/linux/cdrom.h'
patching file `include/linux/major.h'
patching file `pktcdvd.h'
address@hidden linux]#

address@hidden linux]# patch --version
patch 2.5



-- 
Adam
http://www.eax.com      The Supreme Headquarters of the 32 bit registers