Build problems - both release and stable

[Jon Hamilton <hamilton@xxxxxxxxx>]

I installed DragonFly over the weekend, and for the most part things have 
gone pretty smoothly.  I'm having some issues now though rebuilding world
and kernel.  I used cvsup to pull down the cvs repo as of 17:00 on 10/11/04.
I'm having troubles with both the release and stable tags:

Checked out via:
# cvs -d /home/dcvs co -rDragonFly_1_0_REL src /home/dcvs 
# cd /usr/src && make buildworld
[...]
cd /usr/src/secure; make buildincludes; make installincludes
===> secure/lib
===> secure/lib/libcipher
===> secure/lib/libtelnet
===> secure/lib/libcrypto
make: don't know how to make ../e_os.h. Stop
*** Error code 2
Error

cd /usr/src/secure; make buildincludes; make installincludes
===> secure/lib
===> secure/lib/libcipher
===> secure/lib/libtelnet
===> secure/lib/libcrypto
make: don't know how to make ../e_os.h. Stop
*** Error code 2
Error

At this point I edited src/secure/lib/libcrypto/Makefile.inc and removed
the references to e_os.h and e_os2.h - it then failed with:

cd /usr/src/secure; make buildincludes; make installincludes
===> secure/lib
===> secure/lib/libcipher
===> secure/lib/libtelnet
===> secure/lib/libcrypto
make: don't know how to make crypto.h. Stop
*** Error code 2

I blew away /usr/src and /usr/obj and pulled the Stable tree:
# cvs -d /home/dcvs co -rDragonFly_Stable src

Buildworld then went fine.  Building a GENERIC kernel, though:
# make buildkernel KERNCONF=GENERIC
/usr/obj/usr/src/sys/GENERIC/usr/src/sys/libiconv created for /usr/src/sys/libiconv
===> bus
===> bus/cam
===> bus/cam/scsi
@ -> /usr/src/sys/bus/cam/scsi/../../..
machine -> /usr/src/sys/bus/cam/scsi/../../../i386/include
i386 ->
touch opt_ddb.h
touch opt_scsi.h
touch opt_cam.h
awk -f @/tools/makeobjops.awk -- -h @/kern/bus_if.m
awk -f @/tools/makeobjops.awk -- -h @/kern/device_if.m
rm -f .depend
mkdep -f .depend -a   -nostdinc -D_KERNEL -DKLD_MODULE -I. -I@ -I@/../include -I/usr/obj/usr/src/world_i386/usr/include  /usr/src/sys/bus/cam/scsi/scsi_low.c /usr/src/sys/bus/cam/scsi/scsi_low_pisa.c
In file included from /usr/src/sys/bus/cam/scsi/scsi_low.c:114:
/usr/src/sys/bus/cam/scsi/scsi_low.h:77: i386/isa/ccbque.h: Too many levels of symbolic links
In file included from /usr/src/sys/bus/cam/scsi/scsi_low_pisa.c:129:
/usr/src/sys/bus/cam/scsi/scsi_low.h:77: i386/isa/ccbque.h: Too many levels of symbolic links
mkdep: compile failed
*** Error code 1

Stop in /usr/src/sys/bus/cam/scsi.
*** Error code 1                                                  

Any suggestions would be appreciated.

-- 

   Jon Hamilton 
   hamilton@xxxxxxxxx