Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable generation of boot floppy images for sparc, which do not fit on

Browse Source 
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.
This commit is contained in:
martin 2012-03-14 13:26:43 +00:00
parent 0208cf2398
commit 87ec685886
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
distrib/sparc/bootfs/Makefile
View File

@ -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 # boot.fs is the image for disk 1 of the two-set floppy based installation
# method. # method.
@ -13,7 +13,7 @@
.include <bsd.kernobj.mk> .include <bsd.kernobj.mk>
IMAGE= boot.fs IMAGE= boot.fs
IMAGESIZE= 1440k IMAGESIZE= 2880k
LISTS= ${.CURDIR}/list LISTS= ${.CURDIR}/list
MTREECONF= ${DISTRIBDIR}/common/mtree.dot MTREECONF= ${DISTRIBDIR}/common/mtree.dot
IMAGEENDIAN= be IMAGEENDIAN= be
@ -44,14 +44,6 @@ create-aout=\
CLEANFILES+= netbsd.ram.aout.raw 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.image"
.include "${DISTRIBDIR}/common/Makefile.mdset" .include "${DISTRIBDIR}/common/Makefile.mdset"

16
etc/etc.sparc/Makefile.inc
View File

@ -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 # etc.sparc/Makefile.inc -- sparc-specific etc Makefile targets
# #
@ -14,18 +14,24 @@ BUILD_KERNELS= INSTALL
MD_INSTALLATION_DIRS= installation/miniroot \ MD_INSTALLATION_DIRS= installation/miniroot \
installation/netboot \ installation/netboot \
installation/bootfs \ installation/bootfs \
installation/tape \ installation/tape
installation/floppy
# XXX floppy overflows, see below (add to above list to re-enable)
# installation/floppy
INSTALLATION_DIRS+= ${MD_INSTALLATION_DIRS} INSTALLATION_DIRS+= ${MD_INSTALLATION_DIRS}
INSTALLATION_SYMLINKS= \ INSTALLATION_SYMLINKS= \
tape/tapefile1.gz ../bootfs/netbsd.ram.aout.gz \ tape/tapefile1.gz ../bootfs/netbsd.ram.aout.gz \
tape/tapefile2 ../bootfs/instfs.tgz \ tape/tapefile2 ../bootfs/instfs.tgz \
floppy/disk1.gz ../bootfs/boot.fs.gz \
floppy/disk2 ../bootfs/instfs.tgz \
netboot/rootfs.tgz ../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 # Install miniroot images and auxiliary scripts to the release tree
# #