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

Switch i386 and amd64 to native boot, if INTFILES contains bootxx_cd9660. 

Use x86 native boot for current.
Swap i386 and amd64 in multiarch CD sets (cd1 would overflow by 30M otherwise)
and leave vax out (cd3 would overflow by more than 100M - time for a
multi-cd4 ?)
This commit is contained in:
bouyer 2007-03-08 13:51:37 +00:00
parent 7faa36afb7
commit a931914f53
3 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
distrib/cdrom/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.33 2007/03/04 04:59:41 tsutsui Exp $
# $NetBSD: Makefile,v 1.34 2007/03/08 13:51:37 bouyer Exp $
#
# Consult "*.conf" for the configuration variables; this Makefile is typically
# not edited for basic configuration changes.
@ -218,14 +218,26 @@ BASE_PORTS.${image}:= ${bports:O:u}
# i386
.if !empty(ports:Mi386)
.if empty(INTFILES.i386:Mbootxx_cd9660)
# non-emulation boot
MKISOFS_ARGS.${image}+= -b ${BOOTFILE.i386} -c boot.catalog -no-emul-boot
.else
#2.88MB emulation boot
MKISOFS_ARGS.${image}+= -b ${BOOTFILE.i386} -c boot.catalog
.endif
.endif
# amd64
.if !empty(ports:Mamd64)
.if empty(INTFILES.amd64:Mbootxx_cd9660)
# non-emulation boot
MKISOFS_ARGS.${image}+= -b ${BOOTFILE.amd64} -c boot.catalog -no-emul-boot
.else
#2.88MB emulation boot
MKISOFS_ARGS.${image}+= -b ${BOOTFILE.amd64} -c boot.catalog
.endif
.endif
# Mac (mac68k, macppc)

12
distrib/cdrom/NetBSD-current.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD-current.mk,v 1.5 2006/09/17 03:56:03 tsutsui Exp $
# $NetBSD: NetBSD-current.mk,v 1.6 2007/03/08 13:51:51 bouyer Exp $
#
# Configuration file for NetBSD-current.
@ -16,11 +16,17 @@ INTFILES.cats= netbsd.cats:cats/binary/kernel/netbsd.aout-INSTALL.gz
# BOOTFILE.i386 is relative to CD staging root
BOOTFILE.i386= boot.i386
INTFILES.i386= boot.i386:i386/installation/floppy/boot-big.fs,link
INTFILES.i386= boot.i386:i386/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660 \
boot:i386/binary/sets/base.tgz,./usr/mdec/boot \
netbsd:i386/binary/kernel/netbsd-INSTALL_LARGE.gz,link \
nblaptop:i386/binary/kernel/netbsd-INSTALL_LAPTOP.gz,link \
nbnoacpi:i386/binary/kernel/netbsd-INSTALL.gz,link
# BOOTFILE.amd64 is relative to CD staging root
BOOTFILE.amd64= boot.amd64
INTFILES.amd64= boot.amd64:amd64/installation/floppy/boot-big.fs,link
INTFILES.amd64= boot.amd64:amd64/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660 \
boot:amd64/binary/sets/base.tgz,./usr/mdec/boot \
netbsd:amd64/binary/kernel/netbsd-INSTALL.gz,link
# macppc has external bootblock generation tool
EXTFILES.macppc= macppc.bootxx:macppc/binary/sets/base.tgz,./usr/mdec/bootxx \

12
distrib/cdrom/current.conf
View File

@ -1,4 +1,4 @@
# $NetBSD: current.conf,v 1.6 2007/03/07 21:59:15 bouyer Exp $
# $NetBSD: current.conf,v 1.7 2007/03/08 13:51:51 bouyer Exp $
#
# Makefile fragment for CD sets; includes config information.
@ -149,14 +149,16 @@ PREPARER= NetBSD CD Build System
#
# * sgimips must be on a disc on its own
#
# * amd64, alpha and i386 must be on different disks (they all want /boot)
#
BASE_PORTS.multi-cd1-${ISO_RELEASE}= i386 macppc sparc sparc64
BASE_PORTS.multi-cd1-${ISO_RELEASE}= amd64 sparc sparc64 macppc
BASE_PORTS.multi-cd2-${ISO_RELEASE} = alpha \
amiga atari mac68k next68k sun3
amiga atari mac68k next68k sun3
BASE_PORTS.multi-cd3-${ISO_RELEASE}= amd64 \
cobalt hpcmips pmax vax
BASE_PORTS.multi-cd3-${ISO_RELEASE}= i386 \
cobalt hpcmips pmax # vax
BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26
BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32