Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src Commit by patch [pk]:
details: https://anonhg.NetBSD.org/src/rev/509430e4ee4d
branches: netbsd-1-5
changeset: 489936:509430e4ee4d
user: tv <tv%NetBSD.org@localhost>
date: Thu Oct 19 14:24:18 2000 +0000
description:
Commit by patch [pk]:
- boot floppy image out of space: use a two disk system
- update INSTALL kernel
- updates/fixes to miniroot image
- support for building CD image
- update installation doc
diffstat:
distrib/sparc/Makefile | 4 +-
distrib/sparc/bootfs.sysinst/Makefile | 77 ----
distrib/sparc/bootfs.sysinst/list | 4 -
distrib/sparc/bootfs/Makefile | 40 +-
distrib/sparc/install.md | 11 +-
distrib/sparc/instfs/Makefile | 55 +++
distrib/sparc/instfs/exclude | 2 +
distrib/sparc/miniroot/dot.profile | 18 +-
distrib/sparc/miniroot/list | 13 +-
distrib/sparc/ramdisk.sysinst/Makefile | 101 ------
distrib/sparc/ramdisk.sysinst/disktab | 36 --
distrib/sparc/ramdisk.sysinst/dist/base_obsolete | 137 --------
distrib/sparc/ramdisk.sysinst/dist/comp_obsolete | 319 --------------------
distrib/sparc/ramdisk.sysinst/dist/games_obsolete | 8 -
distrib/sparc/ramdisk.sysinst/dist/man_obsolete | 46 --
distrib/sparc/ramdisk.sysinst/dist/misc_obsolete | 16 -
distrib/sparc/ramdisk.sysinst/dist/secr_obsolete | 23 -
distrib/sparc/ramdisk.sysinst/dist/xbase_obsolete | 2 -
distrib/sparc/ramdisk.sysinst/dist/xserver_obsolete | 2 -
distrib/sparc/ramdisk.sysinst/dot.profile.m4 | 73 ----
distrib/sparc/ramdisk.sysinst/list.m4 | 114 -------
distrib/sparc/ramdisk.sysinst/mtree.conf | 77 ----
distrib/sparc/ramdisk.sysinst/ramdiskbin.m4 | 48 ---
distrib/sparc/ramdisk.sysinst/termcap.mini | 202 ------------
distrib/sparc/ramdisk/Makefile | 19 +-
distrib/sparc/ramdisk/dot.profile | 116 +++---
distrib/sparc/ramdisk/list | 121 +------
distrib/sparc/ramdisk/mtree.conf | 38 +--
sys/arch/sparc/conf/INSTALL | 8 +-
sys/arch/sparc/stand/Makefile.buildboot | 12 +-
30 files changed, 208 insertions(+), 1534 deletions(-)
diffs (truncated from 2083 to 300 lines):
diff -r 699fe4fa6562 -r 509430e4ee4d distrib/sparc/Makefile
--- a/distrib/sparc/Makefile Thu Oct 19 14:18:47 2000 +0000
+++ b/distrib/sparc/Makefile Thu Oct 19 14:24:18 2000 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.3 1999/04/30 05:09:43 abs Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2000/10/19 14:24:18 tv Exp $
-SUBDIR= ramdisk bootfs ramdisk.sysinst bootfs.sysinst
+SUBDIR= ramdisk bootfs instfs
.include <bsd.subdir.mk>
diff -r 699fe4fa6562 -r 509430e4ee4d distrib/sparc/bootfs.sysinst/Makefile
--- a/distrib/sparc/bootfs.sysinst/Makefile Thu Oct 19 14:18:47 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-# $NetBSD: Makefile,v 1.4.4.1 2000/08/22 16:06:31 abs Exp $
-
-TOP= ${.CURDIR}/..
-MINIROOT= ${.CURDIR}/../../miniroot
-
-KERN= ${KERNOBJDIR}/INSTALL/netbsd
-
-.include "${TOP}/Makefile.inc"
-
-.include <bsd.own.mk> # So we use /etc/mk.conf.
-.include <bsd.kernobj.mk>
-
-MOUNT_POINT?= /mnt
-VND?= vnd0
-VND_DEV= /dev/${VND}a
-VND_RDEV= /dev/r${VND}a
-VND_CDEV= /dev/${VND}${RAW_PART}
-VND_CRDEV= /dev/r${VND}${RAW_PART}
-FD?= fd0
-FD_RDEV= /dev/r${FD}a
-IMAGE?= syboot.fs
-MDEC= ${DESTDIR}/usr/mdec
-
-LISTS= ${.CURDIR}/list
-RAMDISK!= cd ${TOP}/ramdisk.sysinst/; \
- printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/syramdisk.fs\n" |\
- ${MAKE} -s -f-
-
-DISKTYPE= floppy
-
-# Some reasonable values for the -i parameter to newfs are:
-#
-# 6144 1147k, 189 inodes free
-# 16384 1159k, 93 inodes free
-# 204800 1167k, 29 inodes free
-INO_BYTES= 204800
-
-CLEANFILES+= netbsd.ram.gz netbsd.tmp
-
-${IMAGE}: netbsd.ram.gz
- dd if=/dev/zero of=${IMAGE} bs=1440k count=1
- vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
- disklabel -rw ${VND_CDEV} ${DISKTYPE}
- disklabel -W ${VND_CDEV}
- newfs -B be -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV}
- mount ${VND_DEV} ${MOUNT_POINT}
- TOPDIR=${TOP} CURDIR=${MINIROOT} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} \
- TARGDIR=${MOUNT_POINT} sh ${MINIROOT}/runlist.sh ${LISTS}
- @echo ""
- @df -i ${MOUNT_POINT}
- @echo ""
- @echo "installing new bootblocks"
- -rm -f ${MOUNT_POINT}/boot
- /usr/mdec/binstall -b boot.400000 -v ffs ${MOUNT_POINT}
- umount ${MOUNT_POINT}
- vnconfig -u ${VND_CDEV}
-
-unconfig:
- -umount -f ${MOUNT_POINT}
- -vnconfig -u ${VND_DEV}
-
-netbsd.ram.gz: ${KERN} ${RAMDISK}
- cp ${KERN} netbsd.tmp
- mdsetimage -v netbsd.tmp ${RAMDISK}
- gzip netbsd.tmp
- mv netbsd.tmp.gz ${.TARGET}
-
-clean cleandir distclean:
- /bin/rm -f *.core ${IMAGE} ${CLEANFILES}
-
-depend install:
-
-real-floppy:
- dd if=${IMAGE} of=${FD_RDEV} bs=32k
-
-.include <bsd.obj.mk>
diff -r 699fe4fa6562 -r 509430e4ee4d distrib/sparc/bootfs.sysinst/list
--- a/distrib/sparc/bootfs.sysinst/list Thu Oct 19 14:18:47 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# $NetBSD: list,v 1.1 1999/04/30 05:11:47 abs Exp $
-
-# copy the kernel
-COPY ${OBJDIR}/netbsd.ram.gz netbsd.gz
diff -r 699fe4fa6562 -r 509430e4ee4d distrib/sparc/bootfs/Makefile
--- a/distrib/sparc/bootfs/Makefile Thu Oct 19 14:18:47 2000 +0000
+++ b/distrib/sparc/bootfs/Makefile Thu Oct 19 14:24:18 2000 +0000
@@ -1,4 +1,11 @@
-# $NetBSD: Makefile,v 1.21 2000/06/17 03:10:23 matt Exp $
+# $NetBSD: Makefile,v 1.21.2.1 2000/10/19 14:24:20 tv Exp $
+#
+# boot.fs is the image for disk 1 of the two-set floppy based installation
+# method.
+#
+# It is constructed by injecting the microroot filesystem `ramdisk.fs'
+# into the md based kernel built from the INSTALL kernel configuration file.
+#
TOP= ${.CURDIR}/..
MINIROOT= ${.CURDIR}/../../miniroot
@@ -26,8 +33,6 @@
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" |\
${MAKE} -s -f-
-DISKTYPE= instfs
-
# Some reasonable values for the -i parameter to newfs are:
#
# 6144 1147k, 189 inodes free
@@ -36,18 +41,18 @@
INO_BYTES= 204800
BLOCKSIZE=512
-FSTSIZE=32
-FSSIZE!=if test -f ${RAMDISK}; then BLOCKSIZE=${BLOCKSIZE} du -s ${RAMDISK} | awk '{ print $$1 }'; else echo 32; fi
-FSSIZE!= expr ${FSTSIZE} \* \( \( ${FSSIZE} + ${FSTSIZE} - 1 \) / ${FSTSIZE} \)
-FSNC!=expr ${FSSIZE} / ${FSTSIZE}
+FSSIZE!= expr ${BLOCKSIZE} \* 18 \* 2 \* 80
+
+GEOM=${BLOCKSIZE}/18/2/80
CLEANFILES+= netbsd.ram.gz netbsd.tmp disktab.tmp
-all: netbsd.ram.gz disktab.tmp
- dd if=/dev/zero of=${IMAGE} bs=${BLOCKSIZE} count=${FSSIZE}
- vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
- disklabel -f disktab.tmp -rw ${VND_CDEV} ${DISKTYPE}
- disklabel -W ${VND_CDEV}
+.MAIN: all
+
+all: netbsd.ram.gz
+ dd if=/dev/zero of=${IMAGE} bs=${FSSIZE} count=1
+ vnconfig -v -c ${VND_CDEV} ${IMAGE} ${GEOM}
+ #newfs -B be -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV}
newfs -B be -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
TOPDIR=${TOP} CURDIR=${MINIROOT} OBJDIR=${.OBJDIR} \
@@ -58,7 +63,7 @@
@echo ""
@echo "installing new bootblocks"
-rm -f ${MOUNT_POINT}/boot
- ${MDEC}/binstall -m ${MDEC} -v -b boot.700000 ffs ${MOUNT_POINT}
+ ${MDEC}/binstall -m ${MDEC} -v ffs ${MOUNT_POINT}
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
@@ -66,17 +71,10 @@
-umount -f ${MOUNT_POINT}
-vnconfig -u ${VND_DEV}
-disktab.tmp: netbsd.ram.gz
- @echo "instfs:ty=floppy:se#512:nt#2:rm#300:ns#16:nc#${FSNC}:pa#${FSSIZE}:oa#0:ba#4096:fa#512:ta=4.2BSD:pc#${FSSIZE}:oc#0:" > ${.TARGET}
-
-netbsd.ram: ${KERN} ${RAMDISK}
- cp ${KERN} netbsd.tmp
- mdsetimage -v netbsd.tmp ${RAMDISK}
- mv netbsd.tmp ${.TARGET}
-
netbsd.ram.gz: ${KERN} ${RAMDISK}
cp ${KERN} netbsd.tmp
mdsetimage -v netbsd.tmp ${RAMDISK}
+ strip netbsd.tmp
gzip -9 netbsd.tmp
mv netbsd.tmp.gz ${.TARGET}
diff -r 699fe4fa6562 -r 509430e4ee4d distrib/sparc/install.md
--- a/distrib/sparc/install.md Thu Oct 19 14:18:47 2000 +0000
+++ b/distrib/sparc/install.md Thu Oct 19 14:24:18 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.md,v 1.12 1999/06/27 12:55:59 mrg Exp $
+# $NetBSD: install.md,v 1.12.8.1 2000/10/19 14:24:18 tv Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -47,9 +47,6 @@
RELOCATED_FILES_13="${RELOCATED_FILES_13} /usr/sbin/installboot /usr/mdec/installboot"
fi
-# Mount /kern to get at /kern/msgbuf
-mount -t kernfs none /kern
-
md_set_term() {
if [ ! -z "$TERM" ]; then
return
@@ -81,17 +78,17 @@
md_get_diskdevs() {
# return available disk devices
- < /kern/msgbuf sed -n -e 's/^\(sd[0-9]\) .*/\1/p' -e 's/^\(x[dy][0-9]\) .*/\1/p' | sort -u
+ dmesg | sed -n -e 's/^\(sd[0-9]\) .*/\1/p' -e 's/^\(x[dy][0-9]\) .*/\1/p' | sort -u
}
md_get_cddevs() {
# return available CDROM devices
- < /kern/msgbuf sed -n -e 's/^\(cd[0-9]\) .*/\1/p' | sort -u
+ dmesg | sed -n -e 's/^\(cd[0-9]\) .*/\1/p' | sort -u
}
md_get_ifdevs() {
# return available network devices
- < /kern/msgbuf sed -n -e 's/^\(le[0-9]\) .*/\1/p' -e 's/^\(ie[0-9]\) .*/\1/p' | sort -u
+ dmesg | sed -n -e 's/^\(le[0-9]\) .*/\1/p' -e 's/^\(ie[0-9]\) .*/\1/p' | sort -u
}
md_get_partition_range() {
diff -r 699fe4fa6562 -r 509430e4ee4d distrib/sparc/instfs/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc/instfs/Makefile Thu Oct 19 14:24:18 2000 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: Makefile,v 1.1.2.1 2000/10/19 14:24:21 tv Exp $
+#
+# instfs.tgz is the filesystem image for disk 2 of the floppy based
+# installation method.
+# It is constructed by tarring up the contents of the miniroot with
+# the exeption of the kernel and boot program.
+#
+
+TOP= ${.CURDIR}/..
+MINIROOT= ${.CURDIR}/../../miniroot
+
+.include "${TOP}/Makefile.inc"
+
+MOUNT_POINT?= /mnt
+# DEV/RDEV file system device, CDEV/RDEV vnconfig device
+VND?= vnd0
+VND_DEV= /dev/${VND}a
+VND_RDEV= /dev/r${VND}a
+VND_CDEV= /dev/${VND}c
+VND_CRDEV= /dev/r${VND}c
+INSTFS?= instfs.tgz
+
+MINIROOT_IMAGE!=cd ${MINIROOT}; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/miniroot.fs\n" | \
+ ${MAKE} -s -f-
+
+all: ${INSTFS}
+
+${INSTFS}: ${MINIROOT_IMAGE}
+ vnconfig -v -c ${VND_CDEV} ${MINIROOT_IMAGE}
+ mount ${VND_DEV} ${MOUNT_POINT}
+ (cd ${MOUNT_POINT}; \
+ tar -z -X ${.CURDIR}/exclude -c -f ${.OBJDIR}/${.TARGET} .)
+ umount ${MOUNT_POINT}
+ vnconfig -u ${VND_CDEV}
+
+unconfig:
+ -umount -f ${MOUNT_POINT}
+ -vnconfig -u ${VND_DEV}
+ -/bin/rm -f ${INSTFS}
+
+clean cleandir distclean:
+ /bin/rm -f *.core ${INSTFS}
+
+.ifndef RELEASEDIR
+release:
+ @echo setenv RELEASEDIR first
+ @false
+.else
+release: $(INSTFS)
+ cp ${OBJDIR}/${INSTFS} $(RELEASEDIR)/installation/bootfs
+.endif # RELEASEDIR check
+
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
diff -r 699fe4fa6562 -r 509430e4ee4d distrib/sparc/instfs/exclude
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/sparc/instfs/exclude Thu Oct 19 14:24:18 2000 +0000
@@ -0,0 +1,2 @@
+netbsd
+boot
diff -r 699fe4fa6562 -r 509430e4ee4d distrib/sparc/miniroot/dot.profile
--- a/distrib/sparc/miniroot/dot.profile Thu Oct 19 14:18:47 2000 +0000
+++ b/distrib/sparc/miniroot/dot.profile Thu Oct 19 14:24:18 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.6 2000/06/14 22:52:46 cgd Exp $
+# $NetBSD: dot.profile,v 1.6.2.1 2000/10/19 14:24:22 tv Exp $
#
# Copyright (c) 1995 Jason R. Thorpe
# Copyright (c) 1994 Christopher G. Demetriou
@@ -62,7 +62,13 @@
# Installing or upgrading?
_forceloop=""
while [ "X${_forceloop}" = X"" ]; do
- echo -n '(I)nstall or (U)pgrade? '
Home |
Main Index |
Thread Index |
Old Index