cvs update -dPA from yesterday. make cleandir in /usr/src and /usr/xsrc.=20

This has been going for a while now. First, for some reason, only
GENERIC.MPACPI compile fails as follows

/d/obj1/netbsd-builds/3_99/i386/obj/sys/arch/i386/compile/GENERIC.MPACPI
root@loan8> /d/netbsd-builds/3_99/i386/tools/bin/i386--netbsdelf-gcc
-pipe -ffreestanding -march=3Dpentium3 -O2 -pipe -Werror -Wall -Wno-main
-Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes
-Wstrict-prototypes -Wreturn-type -Wswitch -Wshadow -Wcast-qual
-Wwrite-strings -Wno-sign-compare -fno-zero-initialized-in-bss -Di386
-I. -I/usr/src/sys/arch -I/usr/src/sys -nostdinc -DLKM -DMAXUSERS=3D32
-D_KERNEL -D_KERNEL_OPT -I/usr/src/sys/dist/ipf -c
/usr/src/sys/dev/ic/vga_raster.c
/usr/src/sys/dev/ic/vga_raster.c: In function `vga_cnattach':
/usr/src/sys/dev/ic/vga_raster.c:345: warning: assignment discards
qualifiers from pointer target type
/usr/src/sys/dev/ic/vga_raster.c:348: warning: assignment discards
qualifiers from pointer target type
[1] root@loan8> echo $?
1

I then go to the compile/GENERIC.MPACPI directory and run the above
command without -Werror , which compiles OK; the resulting kernel
(which I run) seems fine:

root@loan8> uname -a
NetBSD loan8 3.99.7 NetBSD 3.99.7 (GENERIC.MPACPI) #1: Sun Jun 26
14:19:36 BST 2005=20
root@loan8:/d/obj1/netbsd-builds/3_99/i386/obj/sys/arch/i386/compile/GENERI=
C.MPACPI
i386

The next has been discussed as well recently with a message that it
has been sorted -

all =3D=3D=3D> etc/i386/floppies/bootfloppy
#    create  bootfloppy/boot (from:
/d/netbsd-builds/3_99/i386/destdir/usr/mdec/boot)
#    create  bootfloppy/netbsd (from:
/d/obj1/netbsd-builds/3_99/i386/obj/distrib/i386/floppies/instkernel/netbsd=
-INSTALL.gz)
#    create  bootfloppy/boot1.fs (from: boot  netbsd)
PAX=3D/d/netbsd-builds/3_99/i386/tools/bin/nbpax sh
/usr/src/distrib/common/buildfloppies.sh  -i
"/d/netbsd-builds/3_99/i386/tools/bin/nbinstallboot  -mi386 @IMAGE@
/d/netbsd-builds/3_99/i386/destdir/usr/mdec/bootxx_ustarfs" -p  -m 2
-s .fs  boot 2880 boot  netbsd
Running instboot: /d/netbsd-builds/3_99/i386/tools/bin/nbinstallboot
-mi386 floppy.25135.tar
/d/netbsd-builds/3_99/i386/destdir/usr/mdec/bootxx_ustarfs
buildfloppies.sh: Image is 6144 bytes (6 KB) too big to fit on 2 disks

*** Failed target:  boot1.fs
*** Failed command: PAX=3D/d/netbsd-builds/3_99/i386/tools/bin/nbpax sh
/usr/src/distrib/common/buildfloppies.sh -i
"/d/netbsd-builds/3_99/i386/tools/bin/nbinstallboot -mi386 @IMAGE@
/d/netbsd-builds/3_99/i386/destdir/usr/mdec/bootxx_ustarfs" -p -m 2 -s
.fs boot 2880 boot netbsd
*** Error code 1

Stop.
nbmake: stopped in /usr/src/distrib/i386/floppies/bootfloppy


I wonder if this is to do with the gcc options in my /etc/mk.conf file
(if that is at all consulted during the build - I don't know) -

.sinclude "/usr/pkg/share/mk/cpuflags.mk"
COPTS+=3D-pipe
CFLAGS+=3D-pipe

TIA