[src/trunk]: src Disable generation of boot floppy images for sparc, which do...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5b3a92f93c6b
branches:  trunk
changeset: 778051:5b3a92f93c6b
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Mar 14 13:26:43 2012 +0000

description:
Disable generation of boot floppy images for sparc, which do not fit on
floppy disks anymore, to unbreak the build (for now).
If someone feels like adding and testing ustarfs support in the floppy
/boot, please reenable again.

diffstat:

 distrib/sparc/bootfs/Makefile |  12 ++----------
 etc/etc.sparc/Makefile.inc    |  16 +++++++++++-----
 2 files changed, 13 insertions(+), 15 deletions(-)

diffs (71 lines):

diff -r 6ba683d0d70f -r 5b3a92f93c6b distrib/sparc/bootfs/Makefile
--- a/distrib/sparc/bootfs/Makefile     Wed Mar 14 13:24:48 2012 +0000
+++ b/distrib/sparc/bootfs/Makefile     Wed Mar 14 13:26:43 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.39 2003/07/10 10:34:14 lukem Exp $
+#      $NetBSD: Makefile,v 1.40 2012/03/14 13:26:43 martin Exp $
 #
 # boot.fs is the image for disk 1 of the two-set floppy based installation
 # method.
@@ -13,7 +13,7 @@
 .include <bsd.kernobj.mk>
 
 IMAGE=         boot.fs
-IMAGESIZE=     1440k
+IMAGESIZE=     2880k
 LISTS=         ${.CURDIR}/list
 MTREECONF=     ${DISTRIBDIR}/common/mtree.dot
 IMAGEENDIAN=   be
@@ -44,14 +44,6 @@
 
 CLEANFILES+=   netbsd.ram.aout.raw
 
-
-FD?=           fd0
-FD_RDEV=       /dev/r${FD}a
-
-real-floppy:
-       dd if=${IMAGE} of=${FD_RDEV} bs=32k
-
-
 .include "${DISTRIBDIR}/common/Makefile.image"
 .include "${DISTRIBDIR}/common/Makefile.mdset"
 
diff -r 6ba683d0d70f -r 5b3a92f93c6b etc/etc.sparc/Makefile.inc
--- a/etc/etc.sparc/Makefile.inc        Wed Mar 14 13:24:48 2012 +0000
+++ b/etc/etc.sparc/Makefile.inc        Wed Mar 14 13:26:43 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.42 2012/01/15 17:36:55 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.43 2012/03/14 13:26:43 martin Exp $
 #
 #      etc.sparc/Makefile.inc -- sparc-specific etc Makefile targets
 #
@@ -14,18 +14,24 @@
 MD_INSTALLATION_DIRS=  installation/miniroot   \
                        installation/netboot    \
                        installation/bootfs     \
-                       installation/tape       \
-                       installation/floppy
+                       installation/tape
+
+# XXX floppy overflows, see below (add to above list to re-enable)
+#                      installation/floppy
+
 INSTALLATION_DIRS+=    ${MD_INSTALLATION_DIRS}
 
 
 INSTALLATION_SYMLINKS= \
                tape/tapefile1.gz       ../bootfs/netbsd.ram.aout.gz    \
                tape/tapefile2          ../bootfs/instfs.tgz            \
-               floppy/disk1.gz         ../bootfs/boot.fs.gz            \
-               floppy/disk2            ../bootfs/instfs.tgz            \
                netboot/rootfs.tgz      ../bootfs/instfs.tgz
 
+# XXX - floppy overflows on boot.fs.gz - so disabled for now,
+# add the following to above list to re-enable
+#              floppy/disk1.gz         ../bootfs/boot.fs.gz
+#              floppy/disk2            ../bootfs/instfs.tgz
+
 #
 # Install miniroot images and auxiliary scripts to the release tree
 #