[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: -current + AIC7890... How to create a boot floppy?

On Thu, May 01, 2003 at 02:34:54PM -0400, Kenneth R Westerback wrote:
> A) Should work fine. Though I usually do 'make clean' first. But I
> am just a touch paranoid. floppy33.fs will be in ramdiskA/obj/.
> On Thu, May 01, 2003 at 05:47:03PM +0000, Alex Farber wrote:
> > I tried to upgrade my PC with ASUS P2B-S and Adaptec
> > AIC 7890AB onboard SCSI controller from 3.2 to 
> > -current, forgetting that this controller needs 
> > a patch http://home.pages.de/~naddy/unix/#OpenBSD 

Thanks. Unfortunately that script hasn't worked
with -current and I doubt I could fix the conflicts 
in the dev/microcode/aic7xxx/aic7xxx.seq myself...

newhope:src {319} ~/ahc.sh
M conf/files
RCS file: /cvs/src/sys/conf/files,v
retrieving revision 1.255
retrieving revision 1.254
Merging differences between 1.255 and 1.254 into files
P arch/i386/isa/ahc_isa.c
P dev/eisa/ahc_eisa.c
RCS file: /cvs/src/sys/dev/ic/aic7xxx.c,v
retrieving revision 1.47
retrieving revision 1.39
Merging differences between 1.47 and 1.39 into aic7xxx.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in dev/ic/aic7xxx.c
C dev/ic/aic7xxx.c
P dev/ic/aic7xxx.h
cvs server: dev/ic/aic7xxx_inline.h is no longer in the repository
cvs server: dev/ic/aic7xxx_openbsd.c is no longer in the repository
cvs server: dev/ic/aic7xxx_openbsd.h is no longer in the repository
P dev/ic/aic7xxxreg.h
U dev/ic/aic7xxxvar.h
P dev/ic/smc93cx6.c
P dev/ic/smc93cx6var.h
P dev/microcode/aic7xxx/Makefile
RCS file: /cvs/src/sys/dev/microcode/aic7xxx/aic7xxx.reg,v
retrieving revision 1.6
retrieving revision 1.4
Merging differences between 1.6 and 1.4 into aic7xxx.reg
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in dev/microcode/aic7xxx/aic7xxx.reg
C dev/microcode/aic7xxx/aic7xxx.reg
RCS file: /cvs/src/sys/dev/microcode/aic7xxx/aic7xxx.seq,v
retrieving revision 1.13
retrieving revision 1.10
Merging differences between 1.13 and 1.10 into aic7xxx.seq
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in dev/microcode/aic7xxx/aic7xxx.seq
C dev/microcode/aic7xxx/aic7xxx.seq
P dev/microcode/aic7xxx/aic7xxx_seq.h
P dev/microcode/aic7xxx/aicasm.c
P dev/microcode/aic7xxx/aicasm.h
P dev/microcode/aic7xxx/aicasm_gram.y
P dev/microcode/aic7xxx/aicasm_scan.l
P dev/microcode/aic7xxx/aicasm_symbol.c
P dev/microcode/aic7xxx/aicasm_symbol.h
P dev/microcode/aic7xxx/sequencer.h
RCS file: /cvs/src/sys/dev/pci/ahc_pci.c,v
retrieving revision 1.37
retrieving revision 1.31
Merging differences between 1.37 and 1.31 into ahc_pci.c
M dev/pci/ahc_pci.c

newhope:src {320} cat ~/ahc.sh 

cd /sys

cvs -d $CVSROOT up -kk -j1.255 -j1.254 conf/files

while read file revision; do
    cvs -d $CVSROOT up -r${revision} ${file}
    done <<TABLE
    arch/i386/isa/ahc_isa.c                 1.9
    dev/eisa/ahc_eisa.c                     1.13
    dev/ic/aic7xxx.c                        1.39
    dev/ic/aic7xxx.h                        1.2
    dev/ic/aic7xxx_inline.h                 1.2
    dev/ic/aic7xxx_openbsd.c                1.4
    dev/ic/aic7xxx_openbsd.h                1.4
    dev/ic/aic7xxxreg.h                     1.9
    dev/ic/aic7xxxvar.h                     1.15
    dev/ic/smc93cx6.c                       1.9
    dev/ic/smc93cx6var.h                    1.8
    dev/microcode/aic7xxx/Makefile          1.3
    dev/microcode/aic7xxx/aic7xxx.reg       1.4
    dev/microcode/aic7xxx/aic7xxx.seq       1.10
    dev/microcode/aic7xxx/aic7xxx_seq.h     1.7
    dev/microcode/aic7xxx/aicasm.c          1.6
    dev/microcode/aic7xxx/aicasm.h          1.3
    dev/microcode/aic7xxx/aicasm_gram.y     1.6
    dev/microcode/aic7xxx/aicasm_scan.l     1.3
    dev/microcode/aic7xxx/aicasm_symbol.c   1.3
    dev/microcode/aic7xxx/aicasm_symbol.h   1.5
    dev/microcode/aic7xxx/sequencer.h       1.3
    dev/pci/ahc_pci.c                       1.31