Index: distrib/notes/Makefile =================================================================== RCS file: /cvsroot/basesrc/distrib/notes/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile 1999/01/13 07:30:01 1.10 +++ Makefile 2000/03/05 07:59:15 @@ -1,5 +1,7 @@ # $NetBSD: Makefile,v 1.10 1999/01/13 07:30:01 ross Exp $ +TARGETS+=release + .ifndef ALLNOTES SUBDIR = ${MACHINE} .else Index: distrib/notes/Makefile.inc =================================================================== RCS file: /cvsroot/basesrc/distrib/notes/Makefile.inc,v retrieving revision 1.4.2.2 diff -u -r1.4.2.2 Makefile.inc --- Makefile.inc 2000/02/10 21:39:30 1.4.2.2 +++ Makefile.inc 2000/03/05 07:59:15 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4.2.2 2000/02/10 21:39:30 he Exp $ +# $NetBSD: Makefile.inc,v 1.9 1999/12/07 22:56:57 soren Exp $ # Ross Harvey @@ -12,14 +12,16 @@ SRCS= ${MAIN} whatis contents hardware xfer prep install\ upgrade donations legal.common legal postinstall ../Makefile.inc\ ${MERGED_SRCS} +ICMD= ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} \ + -o root -g wheel -m ${NONBINMODE} PRESET= ${GFLAGS} -dV=$V -dV_S=${V_S} -dMACHINE=$M -d.CURDIR=${.CURDIR} -r$M=1 -POST_PLAIN= -P-b -P-u -P-o -Tascii +POST_PLAIN= -P-b -P-u -P-o ARGS_PS= ${PRESET} -dformat=PostScript -ARGS_TXT= ${PRESET} -dformat=ASCII ${POST_PLAIN} -ARGS_HTML= ${PRESET} -dformat=HTML ${POST_PLAIN} -ww +ARGS_TXT= ${PRESET} -dformat=ASCII ${POST_PLAIN} -Tascii +ARGS_HTML= ${PRESET} -dformat=HTML ${POST_PLAIN} -Tlatin1 -ww ARGS_MORE= ${PRESET} -dformat=more -P-h -Tascii # @@ -52,6 +54,17 @@ echomore! @echo ${.OBJDIR}/${TARG}.more + +.ifndef RELEASEDIR +release: + @echo setenv RELEASEDIR first + @false +.else +release: +.for i in ${TARGS} + ${ICMD} ${i} ${RELEASEDIR}/. +.endfor +.endif .PATH: ${.CURDIR}/../common Index: sys/arch/sparc/conf/INSTALL =================================================================== RCS file: /cvsroot/syssrc/sys/arch/sparc/conf/INSTALL,v retrieving revision 1.4.2.2 diff -u -r1.4.2.2 INSTALL --- INSTALL 2000/03/01 00:24:46 1.4.2.2 +++ INSTALL 2000/03/11 12:31:09 @@ -15,7 +15,7 @@ options MEMORY_DISK_SERVER=0 # no userspace memory disk support #options MINIROOTSIZE=3074 # size of memory disk, in blocks #options MINIROOTSIZE=3312 # 1.44M * 1.15. this must allow for -options MINIROOTSIZE=3528 # what is in distrib/sparc/ramdisk* +options MINIROOTSIZE=3240 # what is in distrib/sparc/ramdisk* pseudo-device md 1 # memory disk device (ramdisk) Index: distrib/sparc/bootfs/Makefile =================================================================== RCS file: /cvsroot/basesrc/distrib/sparc/bootfs/Makefile,v retrieving revision 1.10.2.3 diff -u -r1.10.2.3 Makefile --- Makefile 2000/03/01 00:23:07 1.10.2.3 +++ Makefile 2000/03/11 12:31:11 @@ -59,7 +59,7 @@ netbsd.ram.gz: ${KERN} ${RAMDISK} cp ${KERN} netbsd.tmp mdsetimage -v netbsd.tmp ${RAMDISK} - strip netbsd.tmp +# strip netbsd.tmp gzip -9 netbsd.tmp mv netbsd.tmp.gz ${.TARGET} @@ -79,6 +79,7 @@ release: $(IMAGE) gzip -c -9 < $(.OBJDIR)/${IMAGE} \ > $(RELEASEDIR)/installation/bootfs/${IMAGE}.gz + cp netbsd.ram.gz $(RELEASEDIR)/binary/kernel/netbsd-INSTALL.gz .endif # RELEASEDIR check .include Index: distrib/sparc/bootfs.sysinst/Makefile =================================================================== RCS file: /cvsroot/basesrc/distrib/sparc/bootfs.sysinst/Makefile,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 Makefile --- Makefile 2000/03/01 00:22:41 1.1.2.1 +++ Makefile 2000/03/11 12:31:11 @@ -48,7 +48,7 @@ @echo "" @echo "installing new bootblocks" -rm -f ${MOUNT_POINT}/boot - /usr/mdec/binstall -v ffs ${MOUNT_POINT} + /usr/mdec/binstall -v -b boot.700000 ffs ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u ${VND_CDEV} @@ -59,7 +59,7 @@ netbsd.ram.gz: ${KERN} ${RAMDISK} cp ${KERN} netbsd.tmp mdsetimage -v netbsd.tmp ${RAMDISK} - strip netbsd.tmp +# strip netbsd.tmp gzip -9 netbsd.tmp mv netbsd.tmp.gz ${.TARGET} @@ -79,6 +79,7 @@ release: $(IMAGE) gzip -c -9 < $(.OBJDIR)/${IMAGE} \ > $(RELEASEDIR)/installation/bootfs/${IMAGE}.gz + cp netbsd.ram.gz $(RELEASEDIR)/binary/kernel/synetbsd-INSTALL.gz .endif # RELEASEDIR check .include Index: distrib/sparc/ramdisk/Makefile =================================================================== RCS file: /cvsroot/basesrc/distrib/sparc/ramdisk/Makefile,v retrieving revision 1.8.2.3 diff -u -r1.8.2.3 Makefile --- Makefile 2000/03/01 00:24:02 1.8.2.3 +++ Makefile 2000/03/11 12:31:11 @@ -20,7 +20,7 @@ LISTS= list MTREE= mtree.conf -CYLS= 98 +CYLS= 90 SECS= 18 TRKS= 2 TOTALSECT != expr ${CYLS} '*' ${SECS} '*' ${TRKS} @@ -35,7 +35,7 @@ vnconfig -v -c ${VND_CDEV} ${IMAGE} ${GEOM} echo "${DISKTYPE}:ty=floppy:se#512:nt#${TRKS}:rm#300:ns#${SECS}:nc#${CYLS}:pa#${TOTALSECT}:oa#0:ba#4096:fa#512:ta=4.2BSD:pc#${TOTALSECT}:oc#0:" > ${DISKTAB} disklabel -rw -f ${DISKTAB} ${VND_CDEV} ${DISKTYPE} - disklabel -W ${VND_CDEV} +# disklabel -W ${VND_CDEV} newfs -B be -m 0 -o space -i ${INO_BYTES} -c ${CYLS} ${VND_RDEV} mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u Index: distrib/sparc/ramdisk/list =================================================================== RCS file: /cvsroot/basesrc/distrib/sparc/ramdisk/list,v retrieving revision 1.7.4.2 diff -u -r1.7.4.2 list --- list 1999/07/01 19:37:11 1.7.4.2 +++ list 2000/03/11 12:31:11 @@ -87,7 +87,7 @@ # copy the MAKEDEV script and make some devices COPY ${TOPDIR}/../../etc/etc.sparc/MAKEDEV dev/MAKEDEV -SPECIAL cd dev; sh MAKEDEV floppy +SPECIAL cd dev; sh MAKEDEV ramdisk SPECIAL /bin/rm dev/MAKEDEV # we need the boot blocks /usr/mdec Index: sys/arch/sparc/dev/zs.c =================================================================== RCS file: /cvsroot/syssrc/sys/arch/sparc/dev/zs.c,v retrieving revision 1.69.2.1 diff -u -r1.69.2.1 zs.c --- zs.c 2000/01/15 16:50:53 1.69.2.1 +++ zs.c 2000/03/11 12:42:49 @@ -450,6 +450,7 @@ rval = softreq = 0; for (unit = 0; unit < zs_cd.cd_ndevs; unit++) { + struct zs_chanstate *cs; zsc = zs_cd.cd_devs[unit]; if (zsc == NULL) continue; @@ -459,8 +460,10 @@ rval |= rr3; zsc->zsc_intrcnt.ev_count++; } - softreq |= zsc->zsc_cs[0]->cs_softreq; - softreq |= zsc->zsc_cs[1]->cs_softreq; + if ((cs = zsc->zsc_cs[0]) != NULL) + softreq |= cs->cs_softreq; + if ((cs = zsc->zsc_cs[1]) != NULL) + softreq |= cs->cs_softreq; } /* We are at splzs here, so no need to lock. */ Index: sys/ufs/lfs/lfs_vfsops.c =================================================================== RCS file: /cvsroot/syssrc/sys/ufs/lfs/lfs_vfsops.c,v retrieving revision 1.28.2.6 diff -u -r1.28.2.6 lfs_vfsops.c --- lfs_vfsops.c 2000/01/20 21:11:46 1.28.2.6 +++ lfs_vfsops.c 2000/03/11 12:42:50 @@ -164,6 +164,11 @@ struct proc *p = curproc; /* XXX */ int error; + if (root_device->dv_class != DV_DISK) + return (ENODEV); + + if (rootdev == NODEV) + return (ENODEV); /* * Get vnodes for swapdev and rootdev. */ Index: sys/arch/sparc/conf/GENERIC =================================================================== RCS file: /cvsroot/syssrc/sys/arch/sparc/conf/GENERIC,v retrieving revision 1.76.2.2 diff -u -r1.76.2.2 GENERIC --- GENERIC 2000/01/05 23:24:39 1.76.2.2 +++ GENERIC 2000/03/17 00:51:54 @@ -136,7 +136,7 @@ file-system PORTAL # portal filesystem (still experimental) file-system PROCFS # /proc file-system CD9660 # ISO 9660 + Rock Ridge file system -file-system UNION # union file system +#file-system UNION # union file system file-system MSDOSFS # MS-DOS FAT filesystem(s). file-system CODA # Coda File System; also needs vcoda (below)