Module Name: src
Committed By: martin
Date: Wed Mar 14 13:26:43 UTC 2012
Modified Files:
src/distrib/sparc/bootfs: Makefile
src/etc/etc.sparc: Makefile.inc
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/distrib/sparc/bootfs/Makefile
cvs rdiff -u -r1.42 -r1.43 src/etc/etc.sparc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sparc/bootfs/Makefile
diff -u src/distrib/sparc/bootfs/Makefile:1.39 src/distrib/sparc/bootfs/Makefile:1.40
--- src/distrib/sparc/bootfs/Makefile:1.39 Thu Jul 10 10:34:14 2003
+++ src/distrib/sparc/bootfs/Makefile Wed Mar 14 13:26:43 2012
@@ -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 @@ create-aout=\
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"
Index: src/etc/etc.sparc/Makefile.inc
diff -u src/etc/etc.sparc/Makefile.inc:1.42 src/etc/etc.sparc/Makefile.inc:1.43
--- src/etc/etc.sparc/Makefile.inc:1.42 Sun Jan 15 17:36:55 2012
+++ src/etc/etc.sparc/Makefile.inc Wed Mar 14 13:26:43 2012
@@ -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 @@ BUILD_KERNELS= INSTALL
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
#
