CVS commit: [netbsd-4] src

[Jeff Rizzo <riz%netbsd.org@localhost>]

Module Name:    src
Committed By:   riz
Date:           Sat Mar 10 19:23:42 UTC 2007

Modified Files:
        src/distrib/i386/cdroms [netbsd-4]: Makefile.cdrom
        src/sys/arch/i386/conf [netbsd-4]: GENERIC

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #494):
        sys/arch/i386/conf/GENERIC.MP: revision 1.9
        distrib/pc532/cdroms/installcd/Makefile: revision 1.1
        distrib/macppc/Makefile: revision 1.15
        distrib/ofppc/Makefile: revision 1.2
        distrib/ibmnws/Makefile: revision 1.2
        distrib/acorn32/Makefile: revision 1.18
        distrib/x68k/cdroms/installcd/Makefile: revision 1.1
        distrib/sparc/Makefile: revision 1.7
        distrib/sparc64/cdroms/Makefile: revision 1.1
        distrib/hp300/cdroms/Makefile: revision 1.1
        distrib/hpcsh/Makefile: revision 1.6
        distrib/ofppc/cdroms/installcd/Makefile: revision 1.1
        distrib/playstation2/Makefile: revision 1.13
        distrib/news68k/cdroms/installcd/Makefile: revision 1.1
        distrib/amiga/cdroms/installcd/Makefile: revision 1.1
        distrib/hp700/cdroms/installcd/Makefile: revision 1.1
        distrib/playstation2/cdroms/Makefile: revision 1.1
        distrib/amiga/cdroms/Makefile: revision 1.1
        etc/etc.mac68k/Makefile.inc: revision 1.18
        distrib/shark/cdroms/installcd/Makefile: revision 1.1
        distrib/hpcmips/Makefile: revision 1.28
        distrib/hpcmips/cdroms/Makefile: revision 1.1
        distrib/amd64/floppies/Makefile: revision 1.3
        sys/arch/amd64/conf/INSTALL_ACPI: file removal
        distrib/i386/cdroms/Makefile: revision 1.4
        distrib/acorn26/cdroms/installcd/Makefile: revision 1.1
        distrib/hpcsh/cdroms/Makefile: revision 1.1
        distrib/prep/cdroms/Makefile: revision 1.1
        distrib/pc532/Makefile: revision 1.4
        distrib/acorn32/cdroms/installcd/Makefile: revision 1.1
        distrib/sun2/Makefile: revision 1.8
        distrib/vax/Makefile: revision 1.17
        distrib/sparc64/cdroms/installcd/Makefile: revision 1.1
        distrib/pmax/cdroms/Makefile: revision 1.1
        distrib/mipsco/cdroms/installcd/Makefile: revision 1.1
        distrib/sun3/cdroms/installcd/Makefile: revision 1.1
        distrib/vax/cdroms/installcd/Makefile: revision 1.1
        distrib/hpcarm/cdroms/installcd/Makefile: revision 1.1
        distrib/mvme68k/Makefile: revision 1.4
        distrib/mvmeppc/cdroms/Makefile: revision 1.1
        distrib/newsmips/Makefile: revision 1.4
        sys/arch/i386/conf/GENERIC.MPACPI: file removal
        distrib/hpcarm/cdroms/Makefile: revision 1.1
        distrib/evbppc/cdroms/Makefile: revision 1.1
        sys/arch/i386/conf/INSTALL_LARGE: revision 1.1
        distrib/i386/cdroms/installcd/Makefile: revision 1.2
        distrib/i386/cdroms/installcd/Makefile: revision 1.3
        doc/CHANGES: revision 1.804
        distrib/hpcsh/cdroms/installcd/Makefile: revision 1.1
        distrib/i386/cdroms/bootcd/Makefile: revision 1.2
        distrib/mvmeppc/cdroms/installcd/Makefile: revision 1.1
        distrib/i386/cdroms/bootcd/Makefile: revision 1.3
        distrib/evbarm/Makefile: revision 1.8
        distrib/mvmeppc/Makefile: revision 1.3
        distrib/i386/cdroms/bootcd-com/Makefile: revision 1.2
        distrib/i386/cdroms/bootcd-com/Makefile: revision 1.3
        distrib/macppc/cdroms/installcd/Makefile: revision 1.1
        distrib/acorn26/cdroms/Makefile: revision 1.1
        distrib/alpha/cdroms/Makefile: revision 1.1
        distrib/hp300/cdroms/installcd/Makefile: revision 1.1
        distrib/amd64/floppies/bootfloppy/Makefile: revision 1.4
        distrib/pmppc/cdroms/installcd/Makefile: revision 1.1
        distrib/hp700/Makefile: revision 1.2
        distrib/pmppc/Makefile: revision 1.2
        distrib/arc/cdroms/Makefile: revision 1.1
        sys/arch/amd64/conf/INSTALL: revision 1.66
        distrib/sun3/cdroms/Makefile: revision 1.1
        distrib/mipsco/Makefile: revision 1.4
        distrib/sun3/Makefile: revision 1.9
        distrib/vax/cdroms/Makefile: revision 1.1
        distrib/pmppc/cdroms/Makefile: revision 1.1
        distrib/amd64/cdroms/Makefile.cdrom: revision 1.1
        distrib/atari/cdroms/installcd/Makefile: revision 1.1
        distrib/evbppc/cdroms/installcd/Makefile: revision 1.1
        distrib/newsmips/cdroms/installcd/Makefile: revision 1.1
        distrib/pmax/Makefile: revision 1.4
        Makefile: revision 1.247
        distrib/cats/cdroms/installcd/Makefile: revision 1.1
        sys/arch/amd64/conf/GENERIC: revision 1.130
        sys/arch/amd64/conf/GENERIC: revision 1.131
        distrib/sgimips/cdroms/installcd/Makefile: revision 1.1
        distrib/hp700/cdroms/Makefile: revision 1.1
        distrib/cats/cdroms/Makefile: revision 1.1
        distrib/evbmips/Makefile: revision 1.3
        distrib/evbmips/Makefile: revision 1.4
        sys/arch/amd64/conf/GENERIC_ACPI: file removal
        distrib/ews4800mips/Makefile: revision 1.2
        distrib/amd64/cdroms/bootcd-com/Makefile: revision 1.2
        distrib/i386/Makefile: revision 1.5
        distrib/amd64/cdroms/installcd/Makefile: revision 1.2
        distrib/mvme68k/cdroms/installcd/Makefile: revision 1.1
        distrib/alpha/cdroms/installcd/Makefile: revision 1.1
        etc/etc.amd64/Makefile.inc: revision 1.7
        distrib/i386/instkernel/Makefile: revision 1.6
        distrib/x68k/cdroms/Makefile: revision 1.1
        distrib/i386/cdroms/Makefile.cdrom: revision 1.1
        distrib/sandpoint/Makefile: revision 1.4
        distrib/i386/cdroms/Makefile.cdrom: revision 1.2
        distrib/amiga/Makefile: revision 1.3
        distrib/amd64/cdroms/bootcd/Makefile: revision 1.2
        distrib/news68k/Makefile: revision 1.4
        distrib/amd64/floppies/bootfloppy-com/Makefile: revision 1.5
        distrib/news68k/cdroms/Makefile: revision 1.1
        distrib/sparc/cdroms/Makefile: revision 1.1
        distrib/shark/cdroms/Makefile: revision 1.1
        etc/Makefile: revision 1.341
        distrib/amd64/instkernel/Makefile: revision 1.2
        distrib/sparc64/Makefile: revision 1.7
        distrib/dreamcast/cdroms/Makefile: revision 1.1
        distrib/shark/Makefile: revision 1.3
        distrib/ews4800mips/cdroms/Makefile: revision 1.1
        distrib/sun2/cdroms/installcd/Makefile: revision 1.1
        distrib/shark/Makefile: revision 1.4
        distrib/macppc/cdroms/Makefile: revision 1.1
        distrib/mvme68k/cdroms/Makefile: revision 1.1
        distrib/sun2/cdroms/Makefile: revision 1.1
        distrib/hpcarm/Makefile: revision 1.3
        distrib/arc/cdroms/installcd/Makefile: revision 1.1
        distrib/hpcmips/cdroms/installcd/Makefile: revision 1.1
        distrib/mipsco/cdroms/Makefile: revision 1.1
        distrib/Makefile.inc: revision 1.9
        distrib/playstation2/cdroms/installcd/Makefile: revision 1.1
        distrib/ibmnws/cdroms/installcd/Makefile: revision 1.1
        distrib/newsmips/cdroms/Makefile: revision 1.1
        distrib/arc/Makefile: revision 1.3
        distrib/sparc/cdroms/installcd/Makefile: revision 1.1
        distrib/evbmips/cdroms/installcd/Makefile: revision 1.1
        distrib/ews4800mips/cdroms/installcd/Makefile: revision 1.1
        distrib/prep/Makefile: revision 1.3
        distrib/ibmnws/cdroms/Makefile: revision 1.1
        distrib/sandpoint/cdroms/Makefile: revision 1.1
        distrib/atari/Makefile: revision 1.6
        distrib/sgimips/cdroms/Makefile: revision 1.1
        distrib/amd64/Makefile: revision 1.4
        distrib/atari/cdroms/Makefile: revision 1.1
        distrib/x68k/Makefile: revision 1.5
        distrib/x68k/Makefile: revision 1.6
        distrib/sandpoint/cdroms/installcd/Makefile: revision 1.1
        distrib/evbarm/cdroms/Makefile: revision 1.1
        distrib/acorn32/cdroms/Makefile: revision 1.1
        distrib/cats/Makefile: revision 1.3
        distrib/evbmips/cdroms/Makefile: revision 1.1
        distrib/pc532/cdroms/Makefile: revision 1.1
        distrib/Makefile: revision 1.14
        distrib/evbarm/cdroms/installcd/Makefile: revision 1.1
        distrib/ofppc/cdroms/Makefile: revision 1.1
        distrib/amd64/cdroms/Makefile: revision 1.3
        distrib/common/Makefile.bootcd: revision 1.8
        distrib/i386/cdroms/bootcd-laptop/Makefile: file removal
        sys/arch/i386/conf/GENERIC: revision 1.813
        distrib/hp300/Makefile: revision 1.17
        sys/arch/i386/conf/GENERIC: revision 1.814
        distrib/evbppc/Makefile: revision 1.2
        distrib/pmax/cdroms/installcd/Makefile: revision 1.1
        etc/etc.i386/Makefile.inc: revision 1.49
        distrib/sgimips/Makefile: revision 1.2
        distrib/prep/cdroms/installcd/Makefile: revision 1.1
        distrib/acorn26/Makefile: revision 1.4
        distrib/dreamcast/cdroms/installcd/Makefile: revision 1.1
        distrib/alpha/Makefile: revision 1.22
        distrib/dreamcast/Makefile: revision 1.2

Missed part of ticket #494 - distrib/i386/cdroms/Makefile.cdrom and
sys/arch/i386/conf/GENERIC:

Improve the use of makefs to build boot CDs, and make it truely MI:
- allow to specify the "instkernel" directory, and allow to put multiple
  kernels on the image
- allow to specify the directory where the image will be created
- only use bootxx_cd9660 if it exists
- search for second-stage boot as usr/mdec/boot.${MACHINE} in addition to
  usr/mdec/boot
- make 'installboot -e' optional
- use target 'release' or 'iso_image' depending on ${CDRELEASE}
- call some MD targets, which will eventually complete the file list or
  make the image bootable
For the benefit of modern hardware, enable ACPI by default in INSTALL and
GENERIC kernels. If ACPI is an issue on your hardware, 'boot -c' and
'disable acpi' should be a workaround. ACPI-enabled kernels works fine
on pre-acpi hardware.
for amd64:
- add ACPI to INSTALL and GENERIC, remove the *_ACPI config files.
- get rid of the bootfloppy-big.fs boot image, and got to a 3-floppy boot
  image
for i386:
- introduce INSTALL_LARGE which has ACPI and some devices with big firmware
- move some devices from INSTALL to INSTALL_LARGE
- Boot floppies still use INSTALL, and bootfloppy-big.fs is still there
  (for thoses who want to build el-torito floppy emulation boot CD) and use
  INSTALL.
For both, drop the 'iso-image' code in etc/ to make the iso bootable, we'll
use something else to build bootable CDs.
Add an iso_image target (iso-image as a target name doesn't play well with
bsd.subdirs.mk) in distrib/makefile, which builds an iso image for $MACHINE
with binary sets, stored in ${RELEASEDIR}/iso. The image is bootable for:
alpha, amd64, cats, i386, pmax, sgimips, sparc, sparc64, sun3, vax.
mac68k/macppc no there yet because of missing feature in makefs.
call iso_image in distrib/ for iso-image in the top Makefile.
Use the new common/Makefile.bootcd to make i386 and amd64 bootable ISO
images. amd64 gets a single kernel; i386 images gets 3 kernels:
- netbsd, copy from netbsd-INSTALL_LARGE.gz, loaded by default
- nbsd-l, copy from netbsd-INSTALL_LAPTOP.gz
- nbsd-i, copy from netbsd-INSTALL.gz for those who want the traditionnal
  non-ACPI kernel
- drop the bootcd-laptop image
both gets an installcd image, which is the same as bootcd but with the
binary sets in addition to kernels.
Make iso-image do nothing for all but mac68k, which still
relies on mkisofs to create bootable ISO image. macppc should also be there,
but it seems the code to make an iso bootable never got added in etc.macppc/
Fix typo in subdir name.
Revert local changes that went in accidentally with the "add ACPI" commit.
Note ACPI by default in i386/amd64, and the iso-image changes.
Fix SUBDIR in previous
Remove duplicate ACPIVERBOSE and ACPI_SCANPCI; pointed out by Nicolas Joly.
Correct typo: the directory is named cdroms, not cdrom.
Use nblaptop and nbnoacpi for the alternative kernel names; as suggected by
Alan Barrett. While there factor out the kernels in Makefile.cdrom.


To generate a diff of this commit:
cvs rdiff -r1.2.2.1 -r1.2.2.2 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -r1.799.2.3 -r1.799.2.4 src/sys/arch/i386/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.