RE: Adaptec Raid

["Michael Blood" <Michael@CustomDB.net>]

I appreciate the help that applied the patch
>michael@www:~/src/linux$ patch -p1 <dpt_i2o-2.0-2.2.18
>patching file `drivers/scsi/Config.in'
>Hunk #1 succeeded at 30 (offset -3 lines).
>patching file `drivers/scsi/Makefile'
>Hunk #1 succeeded at 378 (offset -13 lines).
>Hunk #2 FAILED at 735.
>1 out of 2 hunks FAILED -- saving rejects to drivers/scsi/Makefile.rej
>patching file `drivers/scsi/README.dpti'
>patching file `drivers/scsi/dpti.c'
>patching file `drivers/scsi/dpti.h'
>patching file `drivers/scsi/dpti2oscsi2.c'
>patching file `drivers/scsi/dpti_i2o-dev.h'
>patching file `drivers/scsi/dpti_i2o.h'
>patching file `drivers/scsi/dpti_ioctl.h'
>patching file `drivers/scsi/dptsig.h'
>patching file `drivers/scsi/hosts.c'
>Hunk #1 succeeded at 139 (offset -4 lines).
>Hunk #2 succeeded at 468 (offset -9 lines).
>patching file `drivers/scsi/osd_defs.h'
>patching file `drivers/scsi/osd_util.h'
>patching file `drivers/scsi/sys_info.h'

So most of the patch was applied except for "Hunk #2" which failed at 735.
the file Makefile.rej looks like the following.

>michael@www:~/src/linux$ more drivers/scsi/Makefile.rej
>***************
>*** 727,730 ****
>
>  sd_mod.o: sd.o sd_ioctl.o
>        $(LD) $(LD_RFLAG) -r -o $@ sd.o sd_ioctl.o
>
>--- 735,741 ----

>  sd_mod.o: sd.o sd_ioctl.o
>        $(LD) $(LD_RFLAG) -r -o $@ sd.o sd_ioctl.o
>+
>+ dpt_i2o.o: dpti.c
>+       $(CC) $(CFLAGS) -c dpti.c -o dpt_i2o.o


How can I get these lines in the correct place in the Makefile?  should I
insert them manually at the line positions 727-730 and 735-741?  Would this
be a problem with the version of kernel(2.2.14) that I am patching?

Thanks,

Michael Blood




-----Original Message-----
From: Mike McGuire [mailto:mjm19@po.cwru.edu]
Sent: Monday, July 30, 2001 8:54 AM
To: Michael Blood
Cc: debian-user@lists.debian.org
Subject: Re: Adaptec Raid


>
> Now when I run the patch command:
>   michael@www:~/src/linux$ patch -p0 <../patches/dpt_i2o-2.0-2.2.18
> I recieve the following message
>
> >can't find file to patch at input line 4
> >Perhaps you used the wrong -p or --strip option?
> >The text leading up to this was:
> >--------------------------
> >|diff -urN linux-2.2.18/drivers/scsi/Config.in
> linux->>>>2.2.18.SuSE/drivers/scsi/Config.in
> >|--- linux-2.2.18/drivers/scsi/Config.in        Mon Dec 11 01:49:42 2000
> >|+++ linux-2.2.18.SuSE/drivers/scsi/Config.in   Mon Feb 26 17:46:21 2001
> >--------------------------
> >File to patch:
>
> And it is prompting me for a file to patch.
>
> do you know how to specify the kernel to patch or even what the name is
and
> where it is located in the src.
>

I think you just need to change the -p0 option to -p1, which strips
off the first part of the path (the linux-2.2.18[.SuSE] part) when
applying the patch, and if you're in the linux directory everything
should work since it will look for drivers/scsi/Config.in, etc.

HTH,
Mike McGuire