Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Give up support of 4MB RAM machines for standard sysinst-bas...
details: https://anonhg.NetBSD.org/src/rev/bcb3c834e02c
branches: trunk
changeset: 479882:bcb3c834e02c
user: minoura <minoura%NetBSD.org@localhost>
date: Fri Dec 24 17:02:13 1999 +0000
description:
Give up support of 4MB RAM machines for standard sysinst-based installer.
Restricted small installer must be used on those machines.
diffstat:
distrib/x68k/Makefile | 6 +-
distrib/x68k/floppies/Makefile | 6 +-
distrib/x68k/floppies/bootfloppy-common/Makefile.inc | 11 +-
distrib/x68k/floppies/bootfloppy.sysinst/Makefile | 3 +-
distrib/x68k/floppies/bootfloppy/Makefile | 5 +-
distrib/x68k/floppies/ramdisk.sysinst/Makefile | 16 +-
distrib/x68k/floppies/ramdisk.sysinst/list | 21 +-
distrib/x68k/floppies/ramdisk.sysinst/ramdiskbin.conf | 7 +-
distrib/x68k/floppies/ramdisk/Makefile | 4 +-
sys/arch/x68k/conf/INSTALL | 33 +-
sys/arch/x68k/conf/INSTALL_SMALL | 335 ++++++++++++++++++
11 files changed, 402 insertions(+), 45 deletions(-)
diffs (truncated from 668 to 300 lines):
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/Makefile
--- a/distrib/x68k/Makefile Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/Makefile Fri Dec 24 17:02:13 1999 +0000
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.1 1999/12/05 15:41:58 minoura Exp $
+# $NetBSD: Makefile,v 1.2 1999/12/24 17:02:13 minoura Exp $
SUBDIR= floppies
+.PHONY: release
+
+TARGETS+= release
+
.include <bsd.subdir.mk>
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/floppies/Makefile
--- a/distrib/x68k/floppies/Makefile Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/floppies/Makefile Fri Dec 24 17:02:13 1999 +0000
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1999/12/05 15:53:09 minoura Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/24 17:02:14 minoura Exp $
SUBDIR= ramdisk bootfloppy ramdisk.sysinst bootfloppy.sysinst
+.PHONY: release
+
+TARGETS+= release
+
.include <bsd.subdir.mk>
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/x68k/floppies/bootfloppy-common/Makefile.inc Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/floppies/bootfloppy-common/Makefile.inc Fri Dec 24 17:02:13 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 1999/12/05 15:48:11 minoura Exp $
+# $NetBSD: Makefile.inc,v 1.13 1999/12/24 17:02:15 minoura Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -14,7 +14,6 @@
RAMDISKDIR?= $(.CURDIR)/../ramdisk/
KERN?= netbsd-xxx
KERNNAME?= netbsd.xxx
-KERNSRC?= ${.CURDIR}/../../../../sys
GZNAME?= ${KERNNAME}.gz
MDEC= ${DESTDIR}/usr/mdec
@@ -59,18 +58,16 @@
mdsetimage -v netbsd.tmp ${RAMDISK}
mv -f netbsd.tmp ${.TARGET}
-${KERN}:
- config -s ${KERNSRC} -b ${KERNDIR} ${KERNCNF}
- ( cd ${KERNDIR} ; make depend && make )
-
${GZNAME}: ${KERNNAME}
gzip -cv9 ${KERNNAME} > ${.TARGET}
+depend:
+
release:
-mkdir -p ${RELEASEDIR}/installation/floppy
-mkdir -p ${RELEASEDIR}/installation/misc
cp -p ${IMAGE} ${RELEASEDIR}/installation/floppy
- gzip <${IMAGE} >${RELEASEDIR}/installation/floppies/${IMAGE}.gz
+ gzip <${IMAGE} >${RELEASEDIR}/installation/floppy/${IMAGE}.gz
cp -p ${KERNNAME} ${RELEASEDIR}/installation/misc
cp -p ${GZNAME} ${RELEASEDIR}/installation/misc
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/floppies/bootfloppy.sysinst/Makefile
--- a/distrib/x68k/floppies/bootfloppy.sysinst/Makefile Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/floppies/bootfloppy.sysinst/Makefile Fri Dec 24 17:02:13 1999 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1999/12/05 15:53:10 minoura Exp $
+# $NetBSD: Makefile,v 1.2 1999/12/24 17:02:15 minoura Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= sysinst.fs
-KERNCNF= ${.CURDIR}/../../../../sys/arch/x68k/conf/INSTALL
KERNDIR= ${.CURDIR}/../../../../sys/arch/x68k/compile/INSTALL
KERN= ${KERNDIR}/netbsd
KERNNAME= netbsdsi
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/floppies/bootfloppy/Makefile
--- a/distrib/x68k/floppies/bootfloppy/Makefile Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/floppies/bootfloppy/Makefile Fri Dec 24 17:02:13 1999 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 1999/12/05 15:45:11 minoura Exp $
+# $NetBSD: Makefile,v 1.6 1999/12/24 17:02:14 minoura Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= boot.fs
-KERNCNF= ${.CURDIR}/../../../../sys/arch/x68k/conf/INSTALL
-KERNDIR= ${.CURDIR}/../../../../sys/arch/x68k/compile/INSTALL
+KERNDIR= ${.CURDIR}/../../../../sys/arch/x68k/compile/INSTALL_SMALL
KERN= ${KERNDIR}/netbsd
KERNNAME= netbsd
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/floppies/ramdisk.sysinst/Makefile
--- a/distrib/x68k/floppies/ramdisk.sysinst/Makefile Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/floppies/ramdisk.sysinst/Makefile Fri Dec 24 17:02:13 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/05 16:26:39 minoura Exp $
+# $NetBSD: Makefile,v 1.3 1999/12/24 17:02:15 minoura Exp $
TOP= ${.CURDIR}/..
WARNS=1
@@ -25,11 +25,11 @@
CRUNCHCONF= ${CBIN}.conf
MTREE= mtree.conf
-DISKTYPE= floppy5
+DISKTYPE= floppy3
-all: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS} xxboot
- dd if=/dev/zero of=${IMAGE} count=2400
- vnconfig -v -c ${VND_CDEV} ${IMAGE} 512/15/2/80
+all: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
+ dd if=/dev/zero of=${IMAGE} count=2880
+ vnconfig -v -c ${VND_CDEV} ${IMAGE} 512/18/2/80
newfs -B be -m 0 -o space -i 5120 -c 80 ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u
@@ -61,14 +61,12 @@
# turn off small gethostby* temporarily
HACKOBJS:= getcap.o getgrent.o getnet.o getnetgr.o getpwent.o setlocale.o yplib.o
-# Adjust the size of xxboot.
-xxboot:
- dd if=${DESTDIR}/usr/mdec/sdboot of=${.TARGET} conv=sync
-
# Used in building bootfloppy
echoimage:
@echo ${.OBJDIR}/${IMAGE}
+depend:
+
release:
clean cleandir distclean:
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/floppies/ramdisk.sysinst/list
--- a/distrib/x68k/floppies/ramdisk.sysinst/list Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/floppies/ramdisk.sysinst/list Fri Dec 24 17:02:13 1999 +0000
@@ -1,10 +1,4 @@
-# $NetBSD: list,v 1.2 1999/12/05 16:26:40 minoura Exp $
-
-# Do this first to prevent file system full caused by huge db files.
-COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
-SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
-SPECIAL /bin/rm etc/spwd.db
-SPECIAL /bin/rm etc/pwd.db
+# $NetBSD: list,v 1.3 1999/12/24 17:02:15 minoura Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/ramdiskbin ramdiskbin
@@ -62,8 +56,10 @@
SYMLINK /bin/cat usr/bin/gunzip
SYMLINK /bin/cat usr/bin/gzcat
SYMLINK /bin/cat usr/bin/gzip
+SYMLINK /bin/cat usr/bin/hexdump
SYMLINK /bin/cat usr/bin/less
SYMLINK /bin/cat usr/bin/more
+SYMLINK /bin/cat usr/bin/od
SYMLINK /bin/cat usr/bin/sed
SYMLINK /bin/cat usr/bin/tar
SYMLINK /bin/cat usr/bin/tip
@@ -74,20 +70,25 @@
# various files that we need in /etc for the install
COPY ${CURDIR}/../../../../etc/group etc/group
+COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
COPY ${CURDIR}/../../../../etc/protocols etc/protocols
COPY ${CURDIR}/../../../../etc/services etc/services
+SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
+SPECIAL /bin/rm etc/spwd.db
+SPECIAL /bin/rm etc/pwd.db
+
# copy the MAKEDEV script and make some devices
COPY ${CURDIR}/../../../../etc/etc.x68k/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
SPECIAL /bin/rm dev/MAKEDEV
# we need the boot blocks in /usr/mdec
-COPY ${CURDIR}/installboot.sh usr/mdec/installboot
-SPECIAL /bin/chmod 555 usr/mdec/installboot
-COPY ${OBJDIR}/xxboot usr/mdec/sdboot
+COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot
+COPY ${DESTDIR}/usr/mdec/sdboot usr/mdec/sdboot
LINK usr/mdec/sdboot usr/mdec/fdboot
COPY ${DESTDIR}/usr/mdec/mboot usr/mdec/mboot
+COPY ${DESTDIR}/usr/mdec/newdisk usr/mdec/newdisk
# and the common installation tools
COPY ${CURDIR}/termcap.vt usr/share/misc/termcap
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/floppies/ramdisk.sysinst/ramdiskbin.conf
--- a/distrib/x68k/floppies/ramdisk.sysinst/ramdiskbin.conf Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/floppies/ramdisk.sysinst/ramdiskbin.conf Fri Dec 24 17:02:13 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ramdiskbin.conf,v 1.1 1999/12/05 15:53:10 minoura Exp $
+# $NetBSD: ramdiskbin.conf,v 1.2 1999/12/24 17:02:15 minoura Exp $
#
# ramdiskbin.conf - unified binary for the install ramdisk
#
@@ -6,7 +6,7 @@
srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
progs cat chmod chown chroot cp dd df disklabel ed
-progs fsck fsck_ffs ftp gzip ifconfig init less
+progs fsck fsck_ffs ftp gzip hexdump ifconfig init less
progs ln ls memswitch mkdir mknod mount mount_cd9660 mount_ffs mount_msdos
progs mount_nfs mount_kernfs mt mv newfs ping pwd rcmd reboot restore rm
progs route sed sh shutdown slattach stty swapctl sync pax test
@@ -16,8 +16,7 @@
special sysinst srcdir distrib/utils/sysinst/arch/x68k
special init srcdir distrib/utils/init_s
-special dd srcdir distrib/utils/x_dd
-special ftp srcdir distrib/utils/x_ftp
+#special ftp srcdir distrib/utils/x_ftp
special ifconfig srcdir distrib/utils/x_ifconfig
special ping srcdir distrib/utils/x_ping
special route srcdir distrib/utils/x_route
diff -r 043b55b8a3b8 -r bcb3c834e02c distrib/x68k/floppies/ramdisk/Makefile
--- a/distrib/x68k/floppies/ramdisk/Makefile Fri Dec 24 16:53:45 1999 +0000
+++ b/distrib/x68k/floppies/ramdisk/Makefile Fri Dec 24 17:02:13 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/12/05 15:48:12 minoura Exp $
+# $NetBSD: Makefile,v 1.14 1999/12/24 17:02:15 minoura Exp $
TOP= ${.CURDIR}/..
@@ -71,6 +71,8 @@
echoimage:
@echo ${.OBJDIR}/${IMAGE}
+depend:
+
release:
clean cleandir distclean:
diff -r 043b55b8a3b8 -r bcb3c834e02c sys/arch/x68k/conf/INSTALL
--- a/sys/arch/x68k/conf/INSTALL Fri Dec 24 16:53:45 1999 +0000
+++ b/sys/arch/x68k/conf/INSTALL Fri Dec 24 17:02:13 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.21 1999/12/05 15:40:17 minoura Exp $
+# $NetBSD: INSTALL,v 1.22 1999/12/24 17:02:16 minoura Exp $
#
# INSTALL -- installation kernel.
@@ -12,10 +12,9 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on memory-disk
options MEMORY_DISK_SERVER=0 # No user space hooks
-options MINIROOTSIZE=2400 # 1.2M, same as a 130mm floppy
-#options MINIROOTSIZE=2880 # 1.44M, same as a 90mm floppy
+#options MINIROOTSIZE=2400 # 1.2M, same as a 130mm floppy
+options MINIROOTSIZE=2880 # 1.44M, same as a 90mm floppy
#options MINIROOTSIZE=2048
-options BUFCACHE=5 # Reserve 5% of the RAM as the cache.
## System kernel configuration. See options(4) for more detail.
@@ -29,7 +28,7 @@
#### System options specific to the x68k port
-#options EXTENDED_MEMORY # support for >16MB memory
+options EXTENDED_MEMORY # support for >16MB memory
options FPU_EMULATE # software fpu emulation for MC68030
options FPSP # floating point emulation for MC68040
options M060SP # int/fp emulation for MC68060
@@ -164,8 +163,25 @@
#options FFS_EI # FFS Endian Independent support
#options SOFTDEP # FFS soft updates support.
+# Pull in config fragments for kernel crypto. This is required for
+# options IPSEC etc. to work. If you want to run with IPSEC, uncomment
+# one of these, based on whether you use crypto-us or crypto-intl, and
+# adjust the prefixes as necessary.
+
+#prefix ../crypto-us/sys
+#cinclude "conf/files.crypto-us"
+#prefix
+
+#prefix ../crypto-intl/sys
+#cinclude "conf/files.crypto-intl"
+#prefix
+
## Network protocol support. In most environments, INET is required.
options INET # IP (Internet Protocol) v4
+#options INET6 # IPV6
+#options IPSEC # IP security
+#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
+#options IPSEC_DEBUG # debug for IP security
options TCP_COMPAT_42 # 4.2BSD IP implementation compatibility
#options GATEWAY # packet forwarding ("router switch")
Home |
Main Index |
Thread Index |
Old Index