Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/distrib/i386/floppies Sync with -current. Approved by j...
details: https://anonhg.NetBSD.org/src/rev/b9d03c492b26
branches: netbsd-1-5
changeset: 489727:b9d03c492b26
user: fvdl <fvdl%NetBSD.org@localhost>
date: Mon Oct 09 13:43:27 2000 +0000
description:
Sync with -current. Approved by jhawk. Original commit message:
Rearrange bootfloppies. The idea is that "rescue" tools go on the
floppies as long as they fit, but they are the first to be sacrificed
if space is short, and get moved to a seperate rescue floppy.
This means that the default fdset and the 2.88M image have them,
but others (the "small" and "tiny" floppies) do not.
Sysinst is also back on the "tiny" image, and tested to be working
within 4M.
diffstat:
distrib/i386/floppies/Makefile | 14 +-
distrib/i386/floppies/bootfloppy-big/Makefile | 4 +-
distrib/i386/floppies/bootfloppy-common/Makefile.inc | 8 +-
distrib/i386/floppies/bootfloppy-small/Makefile | 16 +
distrib/i386/floppies/bootfloppy-tiny/Makefile | 4 +-
distrib/i386/floppies/fdset-common/Makefile.inc | 13 +-
distrib/i386/floppies/fdset-laptop/Makefile | 12 +
distrib/i386/floppies/fdset/Makefile | 4 +-
distrib/i386/floppies/kernel-ramdisk/Makefile | 71 ++++++++
distrib/i386/floppies/kernel-rescue/Makefile | 45 +++++
distrib/i386/floppies/ramdisk-big/Makefile | 83 ++++++++++
distrib/i386/floppies/ramdisk-big/disktab.preinstall | 31 +++
distrib/i386/floppies/ramdisk-big/dot.hdprofile | 62 +++++++
distrib/i386/floppies/ramdisk-big/dot.profile | 76 +++++++++
distrib/i386/floppies/ramdisk-big/list | 113 ++++++++++++++
distrib/i386/floppies/ramdisk-big/mtree.conf | 100 ++++++++++++
distrib/i386/floppies/ramdisk-big/ramdiskbin.conf | 52 ++++++
distrib/i386/floppies/ramdisk-big/termcap.mini | 61 +++++++
distrib/i386/floppies/ramdisk-rescuesmall/Makefile | 80 +++++++++
distrib/i386/floppies/ramdisk-rescuesmall/dot.profile | 63 +++++++
distrib/i386/floppies/ramdisk-rescuesmall/list | 95 +++++++++++
distrib/i386/floppies/ramdisk-rescuesmall/mtree.conf | 82 ++++++++++
distrib/i386/floppies/ramdisk-rescuesmall/ramdiskbin.conf | 37 ++++
distrib/i386/floppies/ramdisk-rescuesmall/termcap.mini | 61 +++++++
distrib/i386/floppies/ramdisk-rescuetiny/Makefile | 80 +++++++++
distrib/i386/floppies/ramdisk-rescuetiny/dot.profile | 72 ++++++++
distrib/i386/floppies/ramdisk-rescuetiny/list | 99 ++++++++++++
distrib/i386/floppies/ramdisk-rescuetiny/mtree.conf | 82 ++++++++++
distrib/i386/floppies/ramdisk-rescuetiny/ramdiskbin.conf | 37 ++++
distrib/i386/floppies/ramdisk-rescuetiny/termcap.mini | 61 +++++++
distrib/i386/floppies/ramdisk-small/Makefile | 82 ++++++++++
distrib/i386/floppies/ramdisk-small/dot.hdprofile | 62 +++++++
distrib/i386/floppies/ramdisk-small/dot.profile | 76 +++++++++
distrib/i386/floppies/ramdisk-small/list | 90 +++++++++++
distrib/i386/floppies/ramdisk-small/mtree.conf | 100 ++++++++++++
distrib/i386/floppies/ramdisk-small/ramdiskbin.conf | 40 ++++
distrib/i386/floppies/ramdisk-small/termcap.mini | 61 +++++++
distrib/i386/floppies/ramdisk-tiny/Makefile | 33 +--
distrib/i386/floppies/ramdisk-tiny/Makefile.inc | 4 +-
distrib/i386/floppies/ramdisk-tiny/disktab.preinstall | 2 +-
distrib/i386/floppies/ramdisk-tiny/dot.profile | 9 +-
distrib/i386/floppies/ramdisk-tiny/list | 37 +----
distrib/i386/floppies/ramdisk-tiny/ramdiskbin.conf | 28 +--
distrib/i386/floppies/rescue-small/Makefile | 21 ++
distrib/i386/floppies/rescue-tiny/Makefile | 21 ++
45 files changed, 2185 insertions(+), 99 deletions(-)
diffs (truncated from 2693 to 300 lines):
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/Makefile
--- a/distrib/i386/floppies/Makefile Mon Oct 09 13:27:40 2000 +0000
+++ b/distrib/i386/floppies/Makefile Mon Oct 09 13:43:27 2000 +0000
@@ -1,11 +1,19 @@
-# $NetBSD: Makefile,v 1.19 2000/06/12 18:53:01 he Exp $
+# $NetBSD: Makefile,v 1.19.2.1 2000/10/09 13:43:27 fvdl Exp $
-SUBDIR= ramdisk
+SUBDIR= ramdisk-big
SUBDIR+= ramdisk-tiny
-SUBDIR+= ramdisk-kernel
+SUBDIR+= ramdisk-small
+SUBDIR+= kernel-ramdisk
SUBDIR+= fdset
+SUBDIR+= fdset-laptop
SUBDIR+= bootfloppy-big
SUBDIR+= bootfloppy-tiny
+SUBDIR+= bootfloppy-small
+
+SUBDIR+= ramdisk-rescuesmall
+SUBDIR+= ramdisk-rescuetiny
+SUBDIR+= kernel-rescue
+SUBDIR+= rescue-small rescue-tiny
TARGETS+=release
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/bootfloppy-big/Makefile
--- a/distrib/i386/floppies/bootfloppy-big/Makefile Mon Oct 09 13:27:40 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-big/Makefile Mon Oct 09 13:43:27 2000 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7.4.1 2000/07/20 00:22:43 fvdl Exp $
+# $NetBSD: Makefile,v 1.7.4.2 2000/10/09 13:43:28 fvdl Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= boot-big.fs
-KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
+KERN!= cd $(.CURDIR)/../kernel-ramdisk/; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL.gz\n" | \
${MAKE} -s -f-
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/i386/floppies/bootfloppy-common/Makefile.inc Mon Oct 09 13:27:40 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-common/Makefile.inc Mon Oct 09 13:43:27 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26.4.3 2000/08/11 09:56:53 toddpw Exp $
+# $NetBSD: Makefile.inc,v 1.26.4.4 2000/10/09 13:43:28 fvdl Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -10,7 +10,7 @@
IMAGE?= boot-xxx.fs
FSTMP= ustar.tmp
MDEC= ${DESTDIR}/usr/mdec
-BOOTCODE= ${MDEC}/biosboot.sym
+BOOTCODE?= ${MDEC}/biosboot.sym
#BOOTCODE= ${MDEC}/biosboot_com0.sym # Serial output
STRIP?= strip
@@ -40,8 +40,8 @@
disks=$$(($$size / $$dksize + 1)); \
if test $$size -gt $$dksize; then \
bytes=$$(($$size - $$dksize)); \
- echo "Image is $$bytes ($$(($$bytes / 1024))K) to fit\
- on one disk."; \
+ echo "Image is $$bytes ($$(($$bytes / 1024))K) too big \
+ to fit on one disk."; \
exit 1; \
else \
dd seek=$$(($${size} / 512 + 15)) count=1 \
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/bootfloppy-small/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/i386/floppies/bootfloppy-small/Makefile Mon Oct 09 13:43:27 2000 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.9.2.2 2000/10/09 13:43:28 fvdl Exp $
+
+TOP= ${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
+
+IMAGE= boot-small.fs
+KERN!= cd $(.CURDIR)/../kernel-ramdisk/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL_SMALL.gz\n" | \
+ ${MAKE} -s -f-
+
+DISKTYPE= floppy5
+DISKSIZE= 2400
+BLOCK8K= 149
+
+.include "${TOP}/bootfloppy-common/Makefile.inc"
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/bootfloppy-tiny/Makefile
--- a/distrib/i386/floppies/bootfloppy-tiny/Makefile Mon Oct 09 13:27:40 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-tiny/Makefile Mon Oct 09 13:43:27 2000 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2000/05/05 21:35:51 mycroft Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2000/10/09 13:43:29 fvdl Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= boot-tiny.fs
-KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
+KERN!= cd $(.CURDIR)/../kernel-ramdisk/; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL_TINY.gz\n" | \
${MAKE} -s -f-
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/fdset-common/Makefile.inc
--- a/distrib/i386/floppies/fdset-common/Makefile.inc Mon Oct 09 13:27:40 2000 +0000
+++ b/distrib/i386/floppies/fdset-common/Makefile.inc Mon Oct 09 13:43:27 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16.4.3 2000/08/11 09:56:54 toddpw Exp $
+# $NetBSD: Makefile.inc,v 1.16.4.4 2000/10/09 13:43:29 fvdl Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -25,8 +25,9 @@
tar cvf ${FSTMP} boot netbsd
@echo
@echo Making disk number one
- dd if=/dev/zero of=${IMAGE1} count=${DISKSIZE}
- vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE1}
+ -mv -f ${IMAGE1} ${IMAGE1}.tmp
+ dd if=/dev/zero of=${IMAGE1}.tmp count=${DISKSIZE}
+ vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE1}.tmp
dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_CDEV}
disklabel -rw ${VND_CDEV} ${DISKTYPE}
@echo "installing new bootblocks"
@@ -54,12 +55,16 @@
fi; \
d=$$(($$d + 1)); \
done; \
+ else \
+ dd seek=$$(($${size} / 512 + 15)) count=1 \
+ if=/dev/zero of=${IMAGE1}; \
fi; \
echo; \
bytes=$$(($$dksize * $$disks - $$size)); \
echo "There are $$bytes ($$(($$bytes / 1024))K) bytes free\
on disk $$disks."; \
)
+ mv -f ${IMAGE1}.tmp ${IMAGE1}
# Let the kernel on the diskette be called "netbsd" although
# it is compressed. This is because the boot code will search
@@ -91,7 +96,7 @@
done
clean cleandir distclean:
- /bin/rm -f *.core ${CLEANFILES} ${BASENAME}?.fs
+ /bin/rm -f *.core ${CLEANFILES} ${BASENAME}?.fs ${IMAGE1}.tmp
.include <bsd.own.mk>
.include <bsd.obj.mk>
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/fdset-laptop/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/i386/floppies/fdset-laptop/Makefile Mon Oct 09 13:43:27 2000 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.2.2.2 2000/10/09 13:43:29 fvdl Exp $
+
+TOP= ${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
+
+KERN!= cd $(.CURDIR)/../kernel-ramdisk/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL_LAPTOP.gz\n" | \
+ ${MAKE} -s -f-
+BASENAME=bootlap
+
+.include "${TOP}/fdset-common/Makefile.inc"
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/fdset/Makefile
--- a/distrib/i386/floppies/fdset/Makefile Mon Oct 09 13:27:40 2000 +0000
+++ b/distrib/i386/floppies/fdset/Makefile Mon Oct 09 13:43:27 2000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2000/05/05 20:13:32 mycroft Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2000/10/09 13:43:29 fvdl Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
-KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
+KERN!= cd $(.CURDIR)/../kernel-ramdisk/; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL.gz\n" | \
${MAKE} -s -f-
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/kernel-ramdisk/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/i386/floppies/kernel-ramdisk/Makefile Mon Oct 09 13:43:27 2000 +0000
@@ -0,0 +1,71 @@
+# $NetBSD: Makefile,v 1.1.2.2 2000/10/09 13:43:29 fvdl Exp $
+
+TOP= ${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
+.include <bsd.kernobj.mk>
+.include <bsd.own.mk>
+
+MDEC= ${DESTDIR}/usr/mdec
+STRIP?= strip
+
+#COMMONDIR= ${TOP}/bootfloppy-common
+#LISTS= ${COMMONDIR}/list
+RAMDISK!= cd $(.CURDIR)/../ramdisk-big/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk-big.fs\n" | \
+ ${MAKE} -s -f-
+RAMDISK_T!= cd ${.CURDIR}/../ramdisk-tiny/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk-tiny.fs\n" | \
+ ${MAKE} -s -f-
+RAMDISK_S!= cd ${.CURDIR}/../ramdisk-small/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk-small.fs\n" | \
+ ${MAKE} -s -f-
+
+netbsd.INSTALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL/netbsd ${RAMDISK}
+ cp ${KERNOBJDIR}/INSTALL/netbsd netbsd.tmp
+ ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
+ nm netbsd.tmp > netbsd.INSTALL.symbols
+ ${STRIP} netbsd.tmp
+ gzip -9 netbsd.tmp
+ mv netbsd.tmp.gz ${.TARGET}
+
+netbsd.INSTALL_LAPTOP.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_LAPTOP/netbsd ${RAMDISK}
+ cp ${KERNOBJDIR}/INSTALL_LAPTOP/netbsd netbsd.tmp
+ ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
+ nm netbsd.tmp > netbsd.INSTALL_LAPTOP.symbols
+ ${STRIP} netbsd.tmp
+ gzip -9 netbsd.tmp
+ mv netbsd.tmp.gz ${.TARGET}
+
+netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}
+ cp ${KERNOBJDIR}/INSTALL_TINY/netbsd netbsd.tmp
+ ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_T}
+ nm netbsd.tmp > netbsd.INSTALL_TINY.symbols
+ ${STRIP} netbsd.tmp
+ gzip -9 netbsd.tmp
+ mv netbsd.tmp.gz ${.TARGET}
+
+netbsd.INSTALL_SMALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_SMALL/netbsd ${RAMDISK_S}
+ cp ${KERNOBJDIR}/INSTALL_SMALL/netbsd netbsd.tmp
+ ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_S}
+ nm netbsd.tmp > netbsd.INSTALL_SMALL.symbols
+ ${STRIP} netbsd.tmp
+ gzip -9 netbsd.tmp
+ mv netbsd.tmp.gz ${.TARGET}
+
+KERNELS=netbsd.INSTALL.gz netbsd.INSTALL_TINY.gz netbsd.INSTALL_SMALL.gz \
+ netbsd.INSTALL_LAPTOP.gz
+KERNELSYMS=netbsd.INSTALL.symbols netbsd.INSTALL_TINY.symbols \
+ netbsd.INSTALL_SMALL.symbols netbsd.INSTALL_LAPTOP.symbols
+
+all: ${KERNELS}
+
+release:
+ -mkdir -p ${RELEASEDIR}/binary/kernel
+ cp -p ${KERNELS} ${RELEASEDIR}/binary/kernel
+
+clean cleandir distclean:
+ rm -f *.core ${KERNELS} ${KERNELSYMS}
+
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
diff -r 1a20936e64ca -r b9d03c492b26 distrib/i386/floppies/kernel-rescue/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/i386/floppies/kernel-rescue/Makefile Mon Oct 09 13:43:27 2000 +0000
@@ -0,0 +1,45 @@
+# $NetBSD: Makefile,v 1.2.2.2 2000/10/09 13:43:29 fvdl Exp $
+
+TOP= ${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
+.include <bsd.kernobj.mk>
+.include <bsd.own.mk>
+
+MDEC= ${DESTDIR}/usr/mdec
+STRIP?= strip
+
+RAMDISK_T!= cd ${.CURDIR}/../ramdisk-rescuetiny/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk-rescuetiny.fs\n" | \
+ ${MAKE} -s -f-
+RAMDISK_S!= cd ${.CURDIR}/../ramdisk-rescuesmall/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk-rescuesmall.fs\n" | \
+ ${MAKE} -s -f-
+
+netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}
+ cp ${KERNOBJDIR}/INSTALL_TINY/netbsd netbsd.tmp
+ ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_T}
+ nm netbsd.tmp > netbsd.INSTALL_TINY.symbols
+ ${STRIP} netbsd.tmp
+ gzip -9 netbsd.tmp
+ mv netbsd.tmp.gz ${.TARGET}
+
+netbsd.INSTALL_SMALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_SMALL/netbsd ${RAMDISK_S}
+ cp ${KERNOBJDIR}/INSTALL_SMALL/netbsd netbsd.tmp
+ ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_S}
+ nm netbsd.tmp > netbsd.INSTALL_SMALL.symbols
+ ${STRIP} netbsd.tmp
+ gzip -9 netbsd.tmp
+ mv netbsd.tmp.gz ${.TARGET}
Home |
Main Index |
Thread Index |
Old Index