[src/trunk]: src/distrib/cdrom - add more MACHINE_ARCH.xxx variables

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

details:   https://anonhg.NetBSD.org/src/rev/a31b41484b7b
branches:  trunk
changeset: 537932:a31b41484b7b
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Oct 08 15:20:50 2002 +0000

description:
- add more MACHINE_ARCH.xxx variables
- when building RSYNC_INCLUDE, only add a directory once
- automatically add `shared/ALL' and `shared/${MACHINE_ARCH}' to
  ${BASE_PORTS.${image}} for each unique MACHINE_ARCH in the latter.
- don't bother explicitly listing shared/* in the example
- note that the cats cdrom is now bootable

diffstat:

 distrib/cdrom/Makefile     |  43 +++++++++++++++++++++++++++++++++++++------
 distrib/cdrom/example.conf |  11 +++++------
 2 files changed, 42 insertions(+), 12 deletions(-)

diffs (150 lines):

diff -r f4b8ecbce4af -r a31b41484b7b distrib/cdrom/Makefile
--- a/distrib/cdrom/Makefile    Tue Oct 08 15:09:54 2002 +0000
+++ b/distrib/cdrom/Makefile    Tue Oct 08 15:20:50 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/10/03 07:28:33 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/08 15:20:50 lukem Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -90,30 +90,47 @@
 EXTFILEDIR?=   ${.OBJDIR}/extfiles
 EASTER_EGG?=   /dev/null
 
-##### MACHINE_ARCH for possible shared sets for each port #####
+##### MACHINE_ARCH for possible shared sets for each (shared) port #####
 
+MACHINE_ARCH.acorn26=  arm
+MACHINE_ARCH.acorn32=  arm
+MACHINE_ARCH.algor=    mipsel
 MACHINE_ARCH.amiga=    m68k
 MACHINE_ARCH.amigappc= powerpc
 MACHINE_ARCH.arc=      mipsel
 MACHINE_ARCH.atari=    m68k
 MACHINE_ARCH.bebox=    powerpc
+MACHINE_ARCH.cats=     arm
+MACHINE_ARCH.cesfic=   m68k
 MACHINE_ARCH.cobalt=   mipsel
+MACHINE_ARCH.dreamcast=        sh3el
+MACHINE_ARCH.evbarm=   arm
+MACHINE_ARCH.evbmips=  mipsel
+MACHINE_ARCH.evbsh3=   sh3eb
 MACHINE_ARCH.hp300=    m68k
+MACHINE_ARCH.hpcarm=   arm
 MACHINE_ARCH.hpcmips=  mipsel
+MACHINE_ARCH.hpcsh=    sh3el
 MACHINE_ARCH.luna68k=  m68k
 MACHINE_ARCH.mac68k=   m68k
 MACHINE_ARCH.macppc=   powerpc
 MACHINE_ARCH.mipsco=   mipseb
+MACHINE_ARCH.mmeye=    sh3eb
 MACHINE_ARCH.mvme68k=  m68k
+MACHINE_ARCH.netwinder=        arm
 MACHINE_ARCH.news68k=  m68k
 MACHINE_ARCH.newsmips= mipseb
 MACHINE_ARCH.next68k=  m68k
 MACHINE_ARCH.ofppc=    powerpc
+MACHINE_ARCH.playstation2=mipsel
 MACHINE_ARCH.pmax=     mipsel
 MACHINE_ARCH.prep=     powerpc
+MACHINE_ARCH.sandpoint=        powerpc
+MACHINE_ARCH.sbmips=   mipseb
 MACHINE_ARCH.sgimips=  mipseb
+MACHINE_ARCH.shark=    arm
 MACHINE_ARCH.sun3=     m68k
-MACHINE_ARCH.sun3x=    m68k
+MACHINE_ARCH.walnut=   powerpc
 MACHINE_ARCH.x68k=     m68k
 
 ##### Fetched directories from FTP server #####
@@ -124,13 +141,16 @@
                        --exclude "/shared/[a-z]*/"
 .endif
 
-.for port in ${ALL_PORTS}                      # {
+RSYNC_ARCHS=
+.for port in ${ALL_PORTS:O:u}                  # {
 RSYNC_INCLUDE+=                --include "/${port}/"
 .if defined(MACHINE_ARCH.${port})
-RSYNC_INCLUDE+=                --include "/${MACHINE_ARCH.${port}}/" \
-                       --include "/shared/${MACHINE_ARCH.${port}}/"
+RSYNC_ARCHS+=          ${MACHINE_ARCH.${port}}
 .endif
 .endfor                                                # }
+.for arch in ${RSYNC_ARCHS:O:u}
+RSYNC_INCLUDE+=                --include "/shared/${arch}/"
+.endfor
 
 ##### Boot info and additional options for various platforms #####
 
@@ -142,6 +162,9 @@
 MKISOFS_ARGS+=         -p "${PREPARER}"
 .endif
 
+
+##### Per image settings #####
+
 .for image in ${CD_IMAGES}                     # {
 ports:=${BASE_PORTS.${image}}
 
@@ -169,13 +192,21 @@
 INTDIRS.${image}?=
 ADDFILES.${image}?=
 
+bports=                        shared/ALL
 .for port in ${ports}                                  # {
 EXTFILES+=             ${EXTFILES.${port}}
 INTFILES.${image}+=    ${INTFILES.${port}}
 INTDIRS.${image}+=     ${INTDIRS.${port}}
 ADDFILES.${image}+=    ${ADDFILES.${port}}
 MKISOFS_ARGS.${image}+=        ${MKISOFS_ARGS.${port}}
+# add shared/ALL and shared/${MACHINE_ARCH} to BASE_PORTS.${image}
+bports+=               ${port}
+.if defined(MACHINE_ARCH.${port})
+bports+=               shared/${MACHINE_ARCH.${port}}
+.endif
 .endfor                                                        # }
+BASE_PORTS.${image}:=  ${bports:O:u}
+
 
 # i386
 
diff -r f4b8ecbce4af -r a31b41484b7b distrib/cdrom/example.conf
--- a/distrib/cdrom/example.conf        Tue Oct 08 15:09:54 2002 +0000
+++ b/distrib/cdrom/example.conf        Tue Oct 08 15:20:50 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: example.conf,v 1.6 2002/10/08 07:38:52 lukem Exp $
+# $NetBSD: example.conf,v 1.7 2002/10/08 15:20:50 lukem Exp $
 #
 # Makefile fragment for CD sets; includes config information.
 
@@ -62,7 +62,7 @@
 # The following ports, if included, will be bootable on their respective
 # CD images:
 #
-#     alpha, i386, macppc, pmax, sparc, sparc64, sun3, vax.
+#     alpha, cats, i386, macppc, pmax, sparc, sparc64, sun3, vax.
 #
 # Special notes on booting:
 #
@@ -79,17 +79,16 @@
 #   and sparc64 machines will have to boot with "boot cdrom:g" instead of
 #   "boot cdrom".
 
-BASE_PORTS.cd1=        i386 macppc shared/powerpc sparc sparc64 source
+BASE_PORTS.cd1=        i386 macppc sparc sparc64 source
 
 BASE_PORTS.cd2= alpha \
                amiga atari hp300 mac68k mvme68k news68k next68k sun3 \
-                   shared/m68k \
-               arc cobalt hpcmips pmax shared/mipsel \
+               arc cobalt hpcmips pmax \
                vax
 
 .for image in ${CD_IMAGES}
 #INTDIRS.${image}+=    packages
-BASE_PORTS.${image}+=  CHANGES CHANGES.prev LAST_MINUTE README.files shared/ALL
+BASE_PORTS.${image}+=  CHANGES CHANGES.prev LAST_MINUTE README.files
 .endfor
 
 ##############################################################################