Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/i386/floppies As both boot-small and rescue-small ha...
details: https://anonhg.NetBSD.org/src/rev/4186fb954324
branches: trunk
changeset: 538254:4186fb954324
user: lukem <lukem%NetBSD.org@localhost>
date: Wed Oct 16 04:00:53 2002 +0000
description:
As both boot-small and rescue-small have expanded onto a second 1.2MB
floppy (and there's not the same RAM contraints that *-tiny has),
fold rescue-small into boot-small and deprecate the former.
The "all in one" boot-small is only 100KB larger on the second floppy.
diffstat:
distrib/i386/floppies/Makefile | 6 +-
distrib/i386/floppies/instkernel/Makefile | 4 +-
distrib/i386/floppies/ramdisk-rescuesmall/Makefile | 7 --
distrib/i386/floppies/ramdisk-rescuesmall/list | 71 ----------------------
distrib/i386/floppies/ramdisk-small/Makefile | 4 +-
distrib/i386/floppies/ramdisk-small/list | 17 ++++-
distrib/i386/floppies/rescue-small/Makefile | 8 --
7 files changed, 21 insertions(+), 96 deletions(-)
diffs (226 lines):
diff -r 68ce354cc1a7 -r 4186fb954324 distrib/i386/floppies/Makefile
--- a/distrib/i386/floppies/Makefile Wed Oct 16 03:46:07 2002 +0000
+++ b/distrib/i386/floppies/Makefile Wed Oct 16 04:00:53 2002 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.30 2002/10/14 16:20:39 lukem Exp $
+# $NetBSD: Makefile,v 1.31 2002/10/16 04:00:53 lukem Exp $
SUBDIR= ramdisk-big ramdisk-small ramdisk-tiny \
- ramdisk-rescuesmall ramdisk-rescuetiny \
+ ramdisk-rescuetiny \
.WAIT \
instkernel \
.WAIT \
bootfloppy bootfloppy-big bootfloppy-com bootfloppy-laptop \
bootfloppy-ps2 bootfloppy-small bootfloppy-tiny \
- rescue-small rescue-tiny
+ rescue-tiny
TARGETS+= release
diff -r 68ce354cc1a7 -r 4186fb954324 distrib/i386/floppies/instkernel/Makefile
--- a/distrib/i386/floppies/instkernel/Makefile Wed Oct 16 03:46:07 2002 +0000
+++ b/distrib/i386/floppies/instkernel/Makefile Wed Oct 16 04:00:53 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2002/10/14 16:20:41 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2002/10/16 04:00:53 lukem Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,7 +8,6 @@
RAMDISKS= RAMDISK_B ramdisk-big \
RAMDISK_S ramdisk-small \
RAMDISK_T ramdisk-tiny \
- RESCUE_S ramdisk-rescuesmall \
RESCUE_T ramdisk-rescuetiny
.for V F in ${RAMDISKS}
@@ -21,7 +20,6 @@
INSTALL_SMALL ${RAMDISK_S} - \
INSTALL_TINY ${RAMDISK_T} - \
INSTALL_PS2 ${RAMDISK_S} - \
- INSTALL_SMALL ${RESCUE_S} netbsd.RESCUE_SMALL \
INSTALL_TINY ${RESCUE_T} netbsd.RESCUE_TINY
MDSET_RELEASEDIR= binary/kernel
diff -r 68ce354cc1a7 -r 4186fb954324 distrib/i386/floppies/ramdisk-rescuesmall/Makefile
--- a/distrib/i386/floppies/ramdisk-rescuesmall/Makefile Wed Oct 16 03:46:07 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2002/09/24 06:04:24 grant Exp $
-
-BOOTMODEL= small
-IMAGE= ramdisk-rescue${BOOTMODEL}.fs
-IMAGESIZE= 1440k
-
-.include "${.CURDIR}/../common/Makefile.ramdisk"
diff -r 68ce354cc1a7 -r 4186fb954324 distrib/i386/floppies/ramdisk-rescuesmall/list
--- a/distrib/i386/floppies/ramdisk-rescuesmall/list Wed Oct 16 03:46:07 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-# $NetBSD: list,v 1.7 2002/04/09 00:31:40 lukem Exp $
-#
-
-PROG bin/cat
-PROG bin/chio
-PROG bin/chmod
-PROG bin/cp
-PROG bin/dd
-PROG bin/df
-PROG bin/ed
-PROG bin/ln
-PROG bin/ls
-PROG bin/mkdir
-PROG bin/mt
-PROG bin/mv
-PROG bin/pax usr/bin/tar
-PROG bin/pwd
-PROG bin/rcmd
-PROG bin/rm
-PROG bin/sh
-PROG bin/stty
-PROG bin/sync
-
-PROG sbin/disklabel
-PROG sbin/fdisk
-PROG sbin/fsck
-PROG sbin/fsck_ffs
-PROG sbin/ifconfig
-PROG sbin/init
-PROG sbin/mbrlabel
-PROG sbin/mknod
-PROG sbin/mount
-PROG sbin/mount_cd9660
-PROG sbin/mount_ffs
-PROG sbin/mount_kernfs
-PROG sbin/mount_msdos
-PROG sbin/mount_nfs
-PROG sbin/newfs sbin/mount_mfs
-PROG sbin/ping
-PROG sbin/reboot sbin/halt
-PROG sbin/restore sbin/rrestore
-PROG sbin/route
-PROG sbin/scsictl
-PROG sbin/swapctl
-PROG sbin/umount
-
-PROG usr/bin/ftp
-PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip
-PROG usr/bin/more usr/bin/less
-PROG usr/bin/sed
-PROG usr/bin/tip
-
-PROG usr/mdec/installboot
-
-PROG usr/sbin/bad144
-PROG usr/sbin/chown usr/bin/chgrp
-PROG usr/sbin/chroot
-
-SPECIAL ed srcdir distrib/utils/x_ed
-SPECIAL ftp srcdir distrib/utils/x_ftp
-SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
-SPECIAL more srcdir distrib/utils/more
-SPECIAL mount srcdir distrib/utils/x_mount
-SPECIAL ping srcdir distrib/utils/x_ping
-SPECIAL route srcdir distrib/utils/x_route
-SPECIAL umount srcdir distrib/utils/x_umount
-
-# we have not switched to MI usr.sbin/installboot yet.
-SPECIAL installboot srcdir sys/arch/${MACHINE}/stand/installboot
-
-LIBS libhack.o -lbz2 -ltermcap -lutil -lrmt -ll -lm
diff -r 68ce354cc1a7 -r 4186fb954324 distrib/i386/floppies/ramdisk-small/Makefile
--- a/distrib/i386/floppies/ramdisk-small/Makefile Wed Oct 16 03:46:07 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-small/Makefile Wed Oct 16 04:00:53 2002 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/10/06 17:01:27 thorpej Exp $
+# $NetBSD: Makefile,v 1.19 2002/10/16 04:00:54 lukem Exp $
BOOTMODEL= small
IMAGE= ramdisk-${BOOTMODEL}.fs
-IMAGESIZE= 1440k
+IMAGESIZE= 1600k
USE_SYSINST= yes
.include "${.CURDIR}/../common/Makefile.ramdisk"
diff -r 68ce354cc1a7 -r 4186fb954324 distrib/i386/floppies/ramdisk-small/list
--- a/distrib/i386/floppies/ramdisk-small/list Wed Oct 16 03:46:07 2002 +0000
+++ b/distrib/i386/floppies/ramdisk-small/list Wed Oct 16 04:00:53 2002 +0000
@@ -1,23 +1,32 @@
-# $NetBSD: list,v 1.10 2002/04/09 00:31:40 lukem Exp $
+# $NetBSD: list,v 1.11 2002/10/16 04:00:54 lukem Exp $
PROG bin/cat
+PROG bin/chio
PROG bin/chmod
PROG bin/cp
+PROG bin/dd
+PROG bin/df
+PROG bin/ed
PROG bin/ln
PROG bin/ls
PROG bin/mkdir
+PROG bin/mt
PROG bin/mv
PROG bin/pax usr/bin/tar
PROG bin/pwd
+PROG bin/rcmd
PROG bin/rm
PROG bin/sh
PROG bin/stty
+PROG bin/sync
PROG sbin/disklabel
+PROG sbin/fdisk
PROG sbin/fsck
PROG sbin/fsck_ffs
PROG sbin/ifconfig
PROG sbin/init
+PROG sbin/mbrlabel
PROG sbin/mknod
PROG sbin/mount
PROG sbin/mount_cd9660
@@ -28,7 +37,9 @@
PROG sbin/newfs sbin/mount_mfs
PROG sbin/ping
PROG sbin/reboot sbin/halt
+PROG sbin/restore sbin/rrestore
PROG sbin/route
+PROG sbin/scsictl
PROG sbin/swapctl
PROG sbin/umount
@@ -36,6 +47,7 @@
PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip
PROG usr/bin/more usr/bin/less
PROG usr/bin/sed
+PROG usr/bin/tip
PROG usr/mdec/installboot
@@ -43,6 +55,7 @@
PROG usr/sbin/chown usr/bin/chgrp
PROG usr/sbin/chroot
+SPECIAL ed srcdir distrib/utils/x_ed
SPECIAL ftp srcdir distrib/utils/x_ftp
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
SPECIAL more srcdir distrib/utils/more
@@ -54,4 +67,4 @@
# we have not switched to MI usr.sbin/installboot yet.
SPECIAL installboot srcdir sys/arch/${MACHINE}/stand/installboot
-LIBS libhack.o -lbz2 -lutil -lcurses -ltermcap -lcrypt -ll -lm
+LIBS libhack.o -lbz2 -lutil -lcurses -ltermcap -lcrypt -ll -lm -lrmt
diff -r 68ce354cc1a7 -r 4186fb954324 distrib/i386/floppies/rescue-small/Makefile
--- a/distrib/i386/floppies/rescue-small/Makefile Wed Oct 16 03:46:07 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2002/10/16 01:03:08 lukem Exp $
-
-FLOPPYBASE= rescue-small
-FLOPPYMAX= 2
-FLOPPYKERNEL= netbsd.RESCUE_SMALL.gz
-FLOPPYSIZE= 2400
-
-.include "${.CURDIR}/../common/Makefile.bootfloppy"
Home |
Main Index |
Thread Index |
Old Index