Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. delete all instances of /dev/{r,}vnd0d. Use vnconfig vnd0 and disklabel

Browse Source 
vnd0 and let opendisk(3) DTRT.
2. resize some of the images since we've gotten an average of 5K more
   with the new toolchain.
3. comment out the rescue disks, since they don't fit anymore.

Now the whole directory compiles and works with the in-tree toolchain,
but does not work still with USETOOLS.
This commit is contained in:
christos 2001-11-08 02:10:25 +00:00
parent 1adc8dd435
commit 6e43164c91
9 changed files with 54 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
distrib/i386/floppies/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2001/09/23 23:40:29 tls Exp $
# $NetBSD: Makefile,v 1.26 2001/11/08 02:10:25 christos Exp $
DBG= -Os
@ -14,11 +14,11 @@ SUBDIR+= bootfloppy-ps2
SUBDIR+= bootfloppy-small
SUBDIR+= bootfloppy-tiny
SUBDIR+= ramdisk-rescuesmall
SUBDIR+= ramdisk-rescuetiny
SUBDIR+= kernel-rescue
SUBDIR+= rescue-small
SUBDIR+= rescue-tiny
#SUBDIR+= ramdisk-rescuesmall
#SUBDIR+= ramdisk-rescuetiny
#SUBDIR+= kernel-rescue
#SUBDIR+= rescue-small
#SUBDIR+= rescue-tiny
TARGETS+=release

14
distrib/i386/floppies/bootfloppy-big/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2000/10/17 21:08:43 fvdl Exp $
# $NetBSD: Makefile,v 1.11 2001/11/08 02:10:26 christos Exp $
TOP= ${.CURDIR}/..
@ -34,8 +34,6 @@ MOUNT_POINT?= /mnt
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
MDEC= ${DESTDIR}/usr/mdec
BOOTCODE= ${MDEC}/biosboot.sym
STRIP?= strip
@ -57,9 +55,9 @@ CLEANFILES+= netbsd
realall: netbsd
-rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${DISKSIZE}
vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}.tmp
disklabel -rw ${VND_CDEV} ${DISKTYPE}
newfs -B le -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV} ${DISKTYPE}
vnconfig -t ${DISKTYPE} -v -c ${VND} ${IMAGE}.tmp
disklabel -rw ${VND} ${DISKTYPE}
newfs -B le -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV}
${MDEC}/installboot -v -f ${BOOTCODE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
@ -67,12 +65,12 @@ realall: netbsd
@echo ""
@df -i ${MOUNT_POINT}
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
vnconfig -u ${VND}
mv -f ${IMAGE}.tmp ${IMAGE}
unconfig:
-umount -f ${MOUNT_POINT}
-vnconfig -u ${VND_DEV}
-vnconfig -u ${VND}
-/bin/rm -f ${IMAGE} ${IMAGE}.tmp
netbsd: ${KERN}

12
distrib/i386/floppies/bootfloppy-common/Makefile.inc
View File

@ -1,12 +1,10 @@
# $NetBSD: Makefile.inc,v 1.32 2001/07/02 14:10:09 tv Exp $
# $NetBSD: Makefile.inc,v 1.33 2001/11/08 02:10:26 christos Exp $
# TOP is assumed to be defined by Makefile including this one.
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
IMAGE?= boot-xxx.fs
FSTMP= ustar.tmp
MDEC= ${DESTDIR}/usr/mdec
@ -29,12 +27,12 @@ realall: netbsd boot
@echo Making disk number one
rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${DISKSIZE}
vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}.tmp
dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_CDEV}
disklabel -rw ${VND_CDEV} ${DISKTYPE}
vnconfig -t ${DISKTYPE} -v -c ${VND} ${IMAGE}.tmp
disklabel -rw ${VND} ${DISKTYPE}
dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_RDEV}
@echo "installing new bootblocks"
${MDEC}/installboot -b 17 -v -f ${BOOTCODE} ${VND_RDEV}
vnconfig -u ${VND_CDEV}
vnconfig -u ${VND}
@ls -l ${FSTMP} | (read mode links uid gid size junk; \
dksize=$$((${DISKSIZE} * 512 - 8 * 1024)); \
disks=$$(($$size / $$dksize + 1)); \

14
distrib/i386/floppies/fdset-common/Makefile.inc
View File

@ -1,12 +1,10 @@
# $NetBSD: Makefile.inc,v 1.27 2001/11/07 03:54:13 christos Exp $
# $NetBSD: Makefile.inc,v 1.28 2001/11/08 02:10:27 christos Exp $
# TOP is assumed to be defined by Makefile including this one.
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
BASENAME?= boot
IMAGE1?= ${BASENAME}1.fs
FSTMP= ustar.tmp
@ -28,12 +26,12 @@ realall: unconfig netbsd boot
@echo Making disk number one
-mv -f ${IMAGE1} ${IMAGE1}.tmp
dd if=/dev/zero of=${IMAGE1}.tmp count=${DISKSIZE}
vnconfig -t ${DISKTYPE} -v -c ${VND_CRDEV} ${IMAGE1}.tmp
dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_CDEV}
disklabel -rw ${VND_CRDEV} ${DISKTYPE}
vnconfig -t ${DISKTYPE} -v -c ${VND} ${IMAGE1}.tmp
disklabel -rw ${VND} ${DISKTYPE}
dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_RDEV}
@echo "installing new bootblocks"
${MDEC}/installboot -b 17 -v -f ${BOOTCODE} ${VND_RDEV}
vnconfig -u ${VND_CRDEV}
vnconfig -u ${VND}
@ls -l ${FSTMP} | (read mode links uid gid size junk; \
dksize=$$((${DISKSIZE} * 512 - 8 * 1024)); \
disks=$$(($$size / $$dksize + 1)); \
@ -98,7 +96,7 @@ release:
unconfig:
-umount -f ${MOUNT_POINT}
-vnconfig -u ${VND_CRDEV}
-vnconfig -u ${VND}
clean cleandir distclean:
/bin/rm -f *.core ${CLEANFILES} ${BASENAME}?.fs ${IMAGE1}.tmp

14
distrib/i386/floppies/ramdisk-big/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2001/11/07 02:50:22 christos Exp $
# $NetBSD: Makefile,v 1.11 2001/11/08 02:10:27 christos Exp $
TOP= ${.CURDIR}/..
WARNS=1
@ -12,12 +12,10 @@ AUXDEPENDS= dot.profile dot.hdprofile disktab.preinstall \
CBIN= ramdiskbin
MOUNT_POINT?= /mnt
# DEV/RDEV file system device, CDEV/RDEV vnconfig device
# DEV/RDEV file system device
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
IMAGE?= xxx.fs
MDEC= ${DESTDIR}/usr/mdec
@ -38,10 +36,10 @@ realall: ${IMAGE}
${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CRDEV} ${IMAGE}.tmp \
vnconfig -v -c ${VND} ${IMAGE}.tmp \
512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND_CRDEV} >tmplabel
disklabel -r -R ${VND_CRDEV} tmplabel
-disklabel ${VND} >tmplabel
disklabel -r -R ${VND} tmplabel
newfs -B le -m 0 -o space -i 3950 -c 80 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
@ -51,7 +49,7 @@ ${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_CRDEV}
vnconfig -u ${VND}
mv -f ${IMAGE}.tmp ${IMAGE}
unconfig:

14
distrib/i386/floppies/ramdisk-rescuesmall/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2001/10/13 06:15:17 jmc Exp $
# $NetBSD: Makefile,v 1.13 2001/11/08 02:10:27 christos Exp $
TOP= ${.CURDIR}/..
WARNS=1
@ -11,12 +11,10 @@ AUXDEPENDS= dot.profile termcap.mini
CBIN= ramdiskbin
MOUNT_POINT?= /mnt
# DEV/RDEV file system device, CDEV/RDEV vnconfig device
# DEV/RDEV file system device
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
IMAGE?= xxx.fs
MDEC= ${DESTDIR}/usr/mdec
@ -37,9 +35,9 @@ realall: ${IMAGE}
${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND_CDEV} >tmplabel
disklabel -r -R ${VND_CDEV} tmplabel
vnconfig -v -c ${VND} ${IMAGE}.tmp 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND} >tmplabel
disklabel -r -R ${VND} tmplabel
newfs -B le -m 0 -o space -i 8192 -c 80 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
@ -49,7 +47,7 @@ ${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
vnconfig -u ${VND}
mv -f ${IMAGE}.tmp ${IMAGE}
unconfig:

14
distrib/i386/floppies/ramdisk-rescuetiny/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2001/10/13 06:15:17 jmc Exp $
# $NetBSD: Makefile,v 1.12 2001/11/08 02:10:27 christos Exp $
TOP= ${.CURDIR}/..
WARNS=1
@ -11,12 +11,10 @@ AUXDEPENDS= dot.profile termcap.mini
CBIN= ramdiskbin
MOUNT_POINT?= /mnt
# DEV/RDEV file system device, CDEV/RDEV vnconfig device
# DEV/RDEV file system device
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
IMAGE?= xxx.fs
MDEC= ${DESTDIR}/usr/mdec
@ -37,9 +35,9 @@ realall: ${IMAGE}
${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND_CDEV} >tmplabel
disklabel -r -R ${VND_CDEV} tmplabel
vnconfig -v -c ${VND} ${IMAGE}.tmp 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND} >tmplabel
disklabel -r -R ${VND} tmplabel
newfs -B le -m 0 -o space -i 3950 -c 80 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
@ -49,7 +47,7 @@ ${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
vnconfig -u ${VND}
mv -f ${IMAGE}.tmp ${IMAGE}
unconfig:

16
distrib/i386/floppies/ramdisk-small/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2001/10/13 06:15:17 jmc Exp $
# $NetBSD: Makefile,v 1.12 2001/11/08 02:10:28 christos Exp $
TOP= ${.CURDIR}/..
WARNS=1
@ -11,12 +11,10 @@ AUXDEPENDS= dot.profile disktab.preinstall termcap.mini
CBIN= ramdiskbin
MOUNT_POINT?= /mnt
# DEV/RDEV file system device, CDEV/RDEV vnconfig device
# DEV/RDEV file system device
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
IMAGE?= xxx.fs
MDEC= ${DESTDIR}/usr/mdec
@ -27,7 +25,7 @@ MTREECONF= mtree.conf
CRUNCHGEN?= crunchgen
MTREE?= mtree
RAMDISKSPC= 165
RAMDISKSPC= 170
RAMDISKCYLS= 16
RAMDISKSIZE!= expr ${RAMDISKSPC} \* ${RAMDISKCYLS}
DBG?=-Os
@ -37,10 +35,10 @@ realall: ${IMAGE}
${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp \
vnconfig -v -c ${VND} ${IMAGE}.tmp \
512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND_CDEV} >tmplabel
disklabel -r -R ${VND_CDEV} tmplabel
-disklabel ${VND} >tmplabel
disklabel -r -R ${VND} tmplabel
newfs -B le -m 0 -o space -i 5000 -c 80 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
@ -50,7 +48,7 @@ ${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
vnconfig -u ${VND}
mv -f ${IMAGE}.tmp ${IMAGE}
unconfig:

14
distrib/i386/floppies/ramdisk-tiny/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.14 2001/10/13 06:15:17 jmc Exp $
# $NetBSD: Makefile,v 1.15 2001/11/08 02:10:28 christos Exp $
TOP= ${.CURDIR}/..
WARNS=1
@ -11,12 +11,10 @@ AUXDEPENDS= dot.profile disktab.preinstall termcap.mini
CBIN= ramdiskbin
MOUNT_POINT?= /mnt
# DEV/RDEV file system device, CDEV/RDEV vnconfig device
# DEV/RDEV file system device
VND?= vnd0
VND_DEV= /dev/${VND}a
VND_RDEV= /dev/r${VND}a
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
IMAGE?= xxx.fs
MDEC= ${DESTDIR}/usr/mdec
@ -37,10 +35,10 @@ realall: ${IMAGE}
${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp \
vnconfig -v -c ${VND} ${IMAGE}.tmp \
512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND_CDEV} >tmplabel
disklabel -r -R ${VND_CDEV} tmplabel
-disklabel ${VND} >tmplabel
disklabel -r -R ${VND} tmplabel
newfs -B le -m 0 -o space -i 3950 -c 80 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
${MTREE} -def ${.CURDIR}/${MTREECONF} -p ${MOUNT_POINT}/ -U
@ -50,7 +48,7 @@ ${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREECONF} ${LISTS}
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
vnconfig -u ${VND}
mv -f ${IMAGE}.tmp ${IMAGE}
unconfig: