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

Merge kernel-ramdisk & kernel-rescue into instkernel, now that 

../../common/Makefile.mdset supports building multiple copies of the
same kernel (as long as they're to separate filenames).
Now there's no need to set FLOPPYKERNDIR, as it now defaults to instkernel.
This commit is contained in:
lukem 2002-10-14 16:20:39 +00:00
parent e3ad63279a
commit 858e032a8f
13 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distrib/i386/floppies/Makefile
View File

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.29 2002/04/16 05:23:33 lukem Exp $
# $NetBSD: Makefile,v 1.30 2002/10/14 16:20:39 lukem Exp $
SUBDIR= ramdisk-big ramdisk-small ramdisk-tiny \
ramdisk-rescuesmall ramdisk-rescuetiny \
.WAIT \
kernel-ramdisk kernel-rescue \
instkernel \
.WAIT \
bootfloppy bootfloppy-big bootfloppy-com bootfloppy-laptop \
bootfloppy-ps2 bootfloppy-small bootfloppy-tiny \

3
distrib/i386/floppies/bootfloppy-big/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.19 2002/05/12 10:48:35 lukem Exp $
# $NetBSD: Makefile,v 1.20 2002/10/14 16:20:39 lukem Exp $
# This Makefile builds a boot image on a 2.88M-sized image.
#
@ -17,7 +17,6 @@
FLOPPYBASE= boot-big
FLOPPYSIZE= 5760
FLOPPYPAD= 1
FLOPPYKERNDIR= kernel-ramdisk
FLOPPYKERNEL= netbsd.INSTALL.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"

3
distrib/i386/floppies/bootfloppy-com/Makefile
View File

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.2 2002/04/16 09:06:51 lukem Exp $
# $NetBSD: Makefile,v 1.3 2002/10/14 16:20:39 lukem Exp $
FLOPPYBASE= boot-com
FLOPPYMAX= 2
FLOPPYKERNDIR= kernel-ramdisk
FLOPPYKERNEL= netbsd.INSTALL.gz
FLOPPY_BOOT= ${DESTDIR}/usr/mdec/biosboot_com0.sym # Serial output

3
distrib/i386/floppies/bootfloppy-laptop/Makefile
View File

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.1 2002/04/16 05:23:38 lukem Exp $
# $NetBSD: Makefile,v 1.2 2002/10/14 16:20:40 lukem Exp $
FLOPPYBASE= bootlap
FLOPPYMAX= 2
FLOPPYKERNDIR= kernel-ramdisk
FLOPPYKERNEL= netbsd.INSTALL_LAPTOP.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"

3
distrib/i386/floppies/bootfloppy-ps2/Makefile
View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.7 2002/04/16 05:23:39 lukem Exp $
# $NetBSD: Makefile,v 1.8 2002/10/14 16:20:40 lukem Exp $
FLOPPYBASE= boot-ps2
FLOPPYKERNDIR= kernel-ramdisk
FLOPPYKERNEL= netbsd.INSTALL_PS2.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"

3
distrib/i386/floppies/bootfloppy-small/Makefile
View File

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.14 2002/04/16 05:23:39 lukem Exp $
# $NetBSD: Makefile,v 1.15 2002/10/14 16:20:40 lukem Exp $
FLOPPYBASE= boot-small
FLOPPYSIZE= 2400
FLOPPYKERNDIR= kernel-ramdisk
FLOPPYKERNEL= netbsd.INSTALL_SMALL.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"

3
distrib/i386/floppies/bootfloppy-tiny/Makefile
View File

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.11 2002/04/16 05:23:40 lukem Exp $
# $NetBSD: Makefile,v 1.12 2002/10/14 16:20:40 lukem Exp $
FLOPPYBASE= boot-tiny
FLOPPYSIZE= 2400
FLOPPYKERNDIR= kernel-ramdisk
FLOPPYKERNEL= netbsd.INSTALL_TINY.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"

3
distrib/i386/floppies/bootfloppy/Makefile
View File

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.8 2002/04/16 05:23:36 lukem Exp $
# $NetBSD: Makefile,v 1.9 2002/10/14 16:20:39 lukem Exp $
FLOPPYBASE= boot
FLOPPYMAX= 2
FLOPPYKERNDIR= kernel-ramdisk
FLOPPYKERNEL= netbsd.INSTALL.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"

5
distrib/i386/floppies/common/Makefile.bootfloppy
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.bootfloppy,v 1.12 2002/05/12 10:48:35 lukem Exp $
# $NetBSD: Makefile.bootfloppy,v 1.13 2002/10/14 16:20:40 lukem Exp $
#
# Makefile snippet to create a set of USTAR floppies
#
@ -7,10 +7,10 @@
# Required variables:
# FLOPPYBASE Basename of floppies. Floppy number ${n} will
# be generated as ${FLOPPYBASE}${n}.fs
# FLOPPYKERNDIR ${FLOPPYKERNEL} is from ${.CURDIR}/../${FLOPPYKERNDIR}
# FLOPPYKERNEL Kernel to copy
#
# Optional variables:
# FLOPPYKERNDIR ${FLOPPYKERNEL} is from ${.CURDIR}/../${FLOPPYKERNDIR}
# FLOPPY_BOOT Bootstrap to use. [${DESTDIR}/usr/mdec/biosboot.sym]
#
@ -23,6 +23,7 @@ FLOPPYMETAFILE!= printf "USTAR.volsize.%o" ${FLOPPYSIZE}
.else
FLOPPYSIZE= 2880
.endif
FLOPPYKERNDIR?= instkernel
FLOPPYSUFFIX?= .fs
MDEC= ${DESTDIR}/usr/mdec
# XXXDISTRIB: need MI installboot for i386

15
distrib/i386/floppies/kernel-ramdisk/Makefile → distrib/i386/floppies/instkernel/Makefile
View File

@ -1,13 +1,15 @@
# $NetBSD: Makefile,v 1.22 2002/05/08 21:44:56 lukem Exp $
# $NetBSD: Makefile,v 1.1 2002/10/14 16:20:41 lukem Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
# create ${RAMDISK_*} variables
#
RAMDISKS= RAMDISK_B ramdisk-big \
RAMDISK_S ramdisk-small \
RAMDISK_T ramdisk-tiny
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}
${V}DIR!= cd ${.CURDIR}/../${F} && ${PRINTOBJDIR}
@ -18,7 +20,10 @@ MDSETTARGETS= INSTALL ${RAMDISK_B} - \
INSTALL_LAPTOP ${RAMDISK_B} - \
INSTALL_SMALL ${RAMDISK_S} - \
INSTALL_TINY ${RAMDISK_T} - \
INSTALL_PS2 ${RAMDISK_S} -
INSTALL_PS2 ${RAMDISK_S} - \
INSTALL_SMALL ${RESCUE_S} netbsd.RESCUE_SMALL \
INSTALL_TINY ${RESCUE_T} netbsd.RESCUE_TINY
MDSET_RELEASEDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"

22
distrib/i386/floppies/kernel-rescue/Makefile
View File

@ -1,22 +0,0 @@
# $NetBSD: Makefile,v 1.18 2002/05/08 21:44:56 lukem Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
# create ${RAMDISK_*} variables
#
RAMDISKS= RAMDISK_S ramdisk-rescuesmall \
RAMDISK_T ramdisk-rescuetiny
.for V F in ${RAMDISKS}
${V}DIR!= cd ${.CURDIR}/../${F} && ${PRINTOBJDIR}
${V}= ${${V}DIR}/${F}.fs
.endfor
MDSETTARGETS= INSTALL_SMALL ${RAMDISK_S} netbsd.RESCUE_SMALL \
INSTALL_TINY ${RAMDISK_T} netbsd.RESCUE_TINY
MDSET_RELEASEDIR= binary/kernel
.include "${DISTRIBDIR}/common/Makefile.mdset"
.include <bsd.prog.mk>

3
distrib/i386/floppies/rescue-small/Makefile
View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.9 2002/04/16 05:23:44 lukem Exp $
# $NetBSD: Makefile,v 1.10 2002/10/14 16:20:41 lukem Exp $
FLOPPYBASE= rescue-small
FLOPPYKERNDIR= kernel-rescue
FLOPPYKERNEL= netbsd.RESCUE_SMALL.gz
FLOPPYSIZE= 2400

3
distrib/i386/floppies/rescue-tiny/Makefile
View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.10 2002/04/16 09:08:01 lukem Exp $
# $NetBSD: Makefile,v 1.11 2002/10/14 16:20:41 lukem Exp $
FLOPPYBASE= rescue-tiny
FLOPPYKERNDIR= kernel-rescue
FLOPPYKERNEL= netbsd.RESCUE_TINY.gz
FLOPPYSIZE= 2400