[src/trunk]: src/distrib/cdrom s/${DISTDIR}/${DISTRIBDIR}/ as the former conf...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3945299c30e4
branches:  trunk
changeset: 533210:3945299c30e4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jun 24 14:49:15 2002 +0000

description:
s/${DISTDIR}/${DISTRIBDIR}/ as the former conflicts with pkgsrc.
add 1.6 support for vax cdrom's.  other ports in NetBSD-1.6.mk are as in
1.6.mk and are probably wrong.

diffstat:

 distrib/cdrom/Makefile      |  30 +++++++++++++++---------------
 distrib/cdrom/NetBSD-1.6.mk |  41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 15 deletions(-)

diffs (143 lines):

diff -r 5994caed1b8e -r 3945299c30e4 distrib/cdrom/Makefile
--- a/distrib/cdrom/Makefile    Mon Jun 24 12:00:49 2002 +0000
+++ b/distrib/cdrom/Makefile    Mon Jun 24 14:49:15 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/06/15 02:15:15 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2002/06/24 14:49:15 mrg Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -28,7 +28,7 @@
 .endif
 
 CD_RELEASE?=
-RELEASENAME=           NetBSD-${CD_RELEASE}
+RELEASENAME?=          NetBSD-${CD_RELEASE}
 MKISOFS_ARGS=          -f -A "NetBSD ${CD_RELEASE}" \
                        -hide-rr-moved -m Split -m cdrom
 #                      -hide-list ${.CURDIR}/hide-iso.lst
@@ -73,7 +73,7 @@
 RSYNC?=                /usr/pkg/bin/rsync
 ALPHA_IBOOT?=  /sys/arch/alpha/stand/installboot/installboot
 PMAX_IBOOT?=   /sys/arch/pmax/stand/installboot/installboot
-VAX_IBOOT?=    /sys/arch/vax/stand/installboot/installboot
+VAX_IBOOT?=    /sys/arch/vax/stand/installboot/installboot -sa
 .if !empty(ALL_PORTS:Mmacppc)
 MACPPC_IBOOTDIR!= cd ${.CURDIR}/macppc_installboot && ${PRINTOBJDIR}
 .endif
@@ -82,7 +82,7 @@
 RSYNC_ARGS?=   -va --delete
 RSYNC_EXCLUDE+=        --exclude=/* --exclude=Split --exclude=cdrom
 
-DISTDIR?=      ${.OBJDIR}/download
+DISTRIBDIR?=   ${.OBJDIR}/download
 STAGEDIR?=     ${.OBJDIR}/staging
 IMAGEDIR?=     ${.OBJDIR}
 EXTFILEDIR?=   ${.OBJDIR}/extfiles
@@ -287,22 +287,22 @@
        mkdir -p ${STAGEDIR}/${image}/${dir}
 .endfor
 .for arch in ${BASE_PORTS.${image}}
-       ln -sf `cd ${DISTDIR} && pwd -P`/${RELEASENAME}/${arch} ${STAGEDIR}/${image}/${RELEASE_SUBDIR}/
+       ln -sf `cd ${DISTRIBDIR} && pwd -P`/${RELEASENAME}/${arch} ${STAGEDIR}/${image}/${RELEASE_SUBDIR}/
 .endfor
 .endif
 
 extfileprep:
 .for file in ${EXTFILES}
 extfileprep: ${EXTFILEDIR}/${file:C/:.*$//}
-${EXTFILEDIR}/${file:C/:.*$//}: ${DISTDIR}/${RELEASENAME}/${file:C/^.*://} USE-FILE
-${DISTDIR}/${RELEASENAME}/${file:C/^.*://}: .PHONY
+${EXTFILEDIR}/${file:C/:.*$//}: ${DISTRIBDIR}/${RELEASENAME}/${file:C/^.*://} USE-FILE
+${DISTRIBDIR}/${RELEASENAME}/${file:C/^.*://}: .PHONY
 .endfor
 
 fileprep-${image}:
 .for file in ${INTFILES.${image}}
 fileprep-${image}: ${STAGEDIR}/${image}/${file:C/:.*$//}
-${STAGEDIR}/${image}/${file:C/:.*$//}: ${DISTDIR}/${RELEASENAME}/${file:C/^.*://} USE-FILE
-${DISTDIR}/${RELEASENAME}/${file:C/^.*://}: .PHONY
+${STAGEDIR}/${image}/${file:C/:.*$//}: ${DISTRIBDIR}/${RELEASENAME}/${file:C/^.*://} USE-FILE
+${DISTRIBDIR}/${RELEASENAME}/${file:C/^.*://}: .PHONY
 .endfor
 .for file in ${ADDFILES.${image}}
 fileprep-${image}: ${STAGEDIR}/${image}/${file:C/:.*$//}
@@ -366,7 +366,7 @@
        ${PMAX_IBOOT} -sa $@ ${BOOTFILE.pmax}
 .endif
 .if !empty(BASE_PORTS.${image}:Mvax)
-       ${VAX_IBOOT} -sa $@ ${BOOTFILE.vax}
+       ${VAX_IBOOT} $@ ${BOOTFILE.vax}
 .endif
 .if !empty(BASE_PORTS.${image}:Malpha)
        ${ALPHA_IBOOT} -s $@ ${BOOTFILE.alpha}
@@ -381,13 +381,13 @@
 
 fetch:
 .if !defined(NO_FETCH)
-       @mkdir -p ${DISTDIR}
+       @mkdir -p ${DISTRIBDIR}
        @echo Fetching distributions....
-       @${RSYNC} ${RSYNC_INCLUDE} ${RSYNC_ARGS} ${RSYNC_EXCLUDE} ${RSYNC_SITE} ${DISTDIR}
+       @${RSYNC} ${RSYNC_INCLUDE} ${RSYNC_ARGS} ${RSYNC_EXCLUDE} ${RSYNC_SITE} ${DISTRIBDIR}
 .endif
 
 clean: cleanstagedir cleanimages
-cleandir distclean: cleandistdir
+cleandir distclean: cleandistribdir
 
 cleanimages:
 .for image in ${CD_IMAGES}
@@ -397,5 +397,5 @@
 cleanstagedir:
        -rm -rf ${STAGEDIR} ${EXTFILEDIR}
 
-cleandistdir:
-       -rm -rf ${DISTDIR}
+cleandistribdir:
+       -rm -rf ${DISTRIBDIR}
diff -r 5994caed1b8e -r 3945299c30e4 distrib/cdrom/NetBSD-1.6.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/cdrom/NetBSD-1.6.mk       Mon Jun 24 14:49:15 2002 +0000
@@ -0,0 +1,41 @@
+# $NetBSD: NetBSD-1.6.mk,v 1.1 2002/06/24 14:49:15 mrg Exp $
+#
+# Configuration file for the NetBSD 1.6 binary release.
+
+# sysinst expects the architectures at top level
+RELEASE_SUBDIR=                # empty
+
+# BOOTFILE.alpha is absolute
+BOOTFILE.alpha=                ${EXTFILEDIR}/alpha.bootxx
+EXTFILES.alpha=                alpha.bootxx:alpha/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660
+INTFILES.alpha=                netbsd.alpha:alpha/installation/instkernel/netbsd.gz,link \
+                       boot:alpha/binary/sets/base.tgz,./usr/mdec/boot
+
+# BOOTFILE.i386 is relative to CD staging root
+BOOTFILE.i386=         boot.i386
+INTFILES.i386=         boot.i386:i386/installation/floppy/boot-big.fs,link
+
+# macppc has external bootblock generation tool
+EXTFILES.macppc=       macppc.ofwboot:macppc/binary/sets/base.tgz,./usr/mdec/ofwboot
+INTFILES.macppc=       ofwboot.xcf:macppc/installation/ofwboot.xcf,link \
+                       netbsd.macppc:macppc/installation/netbsd.ram.gz,link
+
+# BOOTFILE.pmax is absolute
+BOOTFILE.pmax=         ${EXTFILEDIR}/pmax.bootxx
+EXTFILES.pmax=         pmax.bootxx:pmax/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660
+INTFILES.pmax=         netbsd.pmax:pmax/binary/kernel/install.gz,link \
+                       boot.pmax:pmax/binary/sets/base.tgz,./usr/mdec/boot.pmax
+
+# BOOTFILE.sparc is absolute
+BOOTFILE.sparc=                ${EXTFILEDIR}/sparc-boot.fs
+EXTFILES.sparc=                sparc-boot.fs:sparc/installation/bootfs/boot.fs.gz
+INTFILES.sparc=                installation/bootfs/instfs.tgz:sparc/installation/bootfs/instfs.tgz,link
+INTDIRS.sparc=         installation/bootfs
+MKISOFS_ARGS.sparc=    -hide-hfs ./installation -hide-joliet ./installation
+
+# BOOTFILE.vax is absolute
+BOOTFILE.vax=          ${EXTFILEDIR}/vax.xxboot
+EXTFILES.vax=          vax.xxboot:vax/binary/sets/base.tgz,./usr/mdec/xxboot
+INTFILES.vax=          netbsd.vax:vax/installation/netboot/install.ram.gz,link \
+                       boot.vax:vax/binary/sets/base.tgz,./usr/mdec/boot
+VAX_IBOOT?=            ${INSTALLBOOT} -m vax -o sunsum -o append