[src/trunk]: src/distrib/cdrom Minor updates, fixes, and cleanups.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/distrib/cdrom Minor updates, fixes, and cleanups.
From: tv <tv%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 08:15:28 +0000
details:   https://anonhg.NetBSD.org/src/rev/5d1b1b7b27eb
branches:  trunk
changeset: 499802:5d1b1b7b27eb
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 29 19:56:19 2000 +0000

description:
Minor updates, fixes, and cleanups.

diffstat:

 distrib/cdrom/Makefile      |  47 ++++++++++++++++++++++++--------------------
 distrib/cdrom/NetBSD-1.5.mk |   6 +----
 distrib/cdrom/example.conf  |  16 ++++++++++----
 distrib/cdrom/hide-hfs.lst  |   4 ++-
 4 files changed, 41 insertions(+), 32 deletions(-)

diffs (185 lines):

diff -r 845089a2b57d -r 5d1b1b7b27eb distrib/cdrom/Makefile
--- a/distrib/cdrom/Makefile    Wed Nov 29 19:47:31 2000 +0000
+++ b/distrib/cdrom/Makefile    Wed Nov 29 19:56:19 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2000/11/29 16:35:03 tv Exp $
+# $NetBSD: Makefile,v 1.2 2000/11/29 19:56:19 tv Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -69,24 +69,23 @@
 ##### Default paths for programs #####
 
 MKISOFS?=      /usr/pkg/bin/mkisofs
-MKSUNBOOTCD?=  /usr/pkg/sbin/mksunbootcd
+MKSUNBOOTCD?=  /usr/src/distrib/utils/mksunbootcd/mksunbootcd
 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
 .if !empty(ALL_PORTS:Mmacppc)
 MACPPC_IBOOTDIR!= cd ${.CURDIR}/macppc_installboot && ${MAKE} print-objdir
-MACPPC_IBOOT=  ${MACPPC_IBOOTDIR}/macppc_installboot
 .endif
 
 RSYNC_SITE?=   ftp.netbsd.org:/pub/NetBSD/
 RSYNC_ARGS?=   -va --delete --rsh=ssh
 RSYNC_EXCLUDE+=        --exclude=/* --exclude=Split --exclude=cdrom
 
-DISTDIR?=      ./download
-STAGEDIR?=     ./staging
-IMAGEDIR?=     .
-EXTFILEDIR?=   ./extfiles
+DISTDIR?=      ${.OBJDIR}/download
+STAGEDIR?=     ${.OBJDIR}/staging
+IMAGEDIR?=     ${.OBJDIR}
+EXTFILEDIR?=   ${.OBJDIR}/extfiles
 EASTER_EGG?=   /dev/null
 
 RELEASE_SUBDIR?=${RELEASENAME}
@@ -182,20 +181,16 @@
 
 # Mac (mac68k, macppc)
 
-.if !empty(ports:Mmac*)
+.if !empty(ports:Mmacppc)
 MKISOFS_ARGS.${image}+=        -hfs -part -hide-hfs-list ${.CURDIR}/hide-hfs.lst \
-                       --macbin
-
-.if !empty(ports:Mmacppc)
-MKISOFS_ARGS.${image}+= -boot-hfs-file macppc_installboot/macppcboot.raw
-.endif
-
-.elif defined(USE_APPLE_ISO)
+                       --macbin -boot-hfs-file ${MACPPC_IBOOTDIR}/macppcboot.raw
+.elif defined(USE_APPLE_ISO) || !empty(ports:Mmac68k)
 MKISOFS_ARGS.${image}+=        -apple --macbin
 .endif
 
 # Sun (sparc, sparc64, sun3)
 
+SUN_BOOT_ARGS.${image}:=
 .if !empty(ports:Msparc*) || !empty(ports:Msun3*)
 SUN_BOOT.123:= /dev/null
 SUN_BOOT.4:=   /dev/null
@@ -228,6 +223,10 @@
 .endif
 
 SUN_BOOT_ARGS.${image}:= ${SUN_BOOT.123} ${SUN_BOOT.123} ${SUN_BOOT.123} ${SUN_BOOT.4} ${SUN_BOOT.5}
+
+.if empty(SUN_BOOT_ARGS.${image}:N/dev/null)
+SUN_BOOT_ARGS.${image}:=
+.endif
 .endif
 
 .endfor
@@ -318,7 +317,11 @@
 # 4. Add bootfile sizes rounded up to 512 bytes for pmax and vax.
 # 5. Round up to a 32k boundary, then add another 32k for TAO padding.
 
-size-${image}:
+.if !empty(BASE_PORTS.${image}:Mmacppc)
+size-${image}: all-macppc_installboot
+.endif
+
+size-${image}: stage-${image} extfileprep fileprep-${image}
        @size=$$((`cd ${STAGEDIR}/${image} && ${MKISOFS} ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} -print-size . 2>&1 | tee /dev/stderr | sed '/=/!d;s/^[^=]*=//'` * 2048)) && \
        if [ "${SUN_BOOT_ARGS.${image}}" != "" ]; then \
                size=$$(($$(($$size + 327679)) / 327680 * 327680)) && \
@@ -342,14 +345,16 @@
        echo "Projected size of ${image}.iso: $$size bytes ($${sizek}K)." && \
        if [ $$sizek -gt 666000 ]; then echo "Image too large for 74-minute CD!"; false; fi
 
-${IMAGEDIR}/${image}.iso: fetch stage-${image} extfileprep fileprep-${image} size-${image}
-       cd ${STAGEDIR}/${image} && ${MKISOFS} -o ${.CURDIR}/$@ ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} .
-.if defined(SUN_BOOT_ARGS.${image})
+# Actually build the image with all the bootstrap goo....
+
+${IMAGEDIR}/${image}.iso: fetch size-${image}
+       cd ${STAGEDIR}/${image} && ${MKISOFS} -o $@ ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} .
+.if !empty(SUN_BOOT_ARGS.${image})
        ${MKSUNBOOTCD} -c 640 $@ ${SUN_BOOT_ARGS.${image}}
 .endif
 .if !empty(BASE_PORTS.${image}:Mmacppc)
        @blknum=$$((`ls -l $@ | awk '{print $$5}'` / 512)) && \
-       ${MACPPC_IBOOT} $@ $$blknum 756
+       ${MACPPC_IBOOTDIR}/macppc_installboot $@ $$blknum 756
        dd if=${EXTFILEDIR}/macppc.ofwboot bs=64k count=1 conv=sync >>$@ 2>/dev/null
 .endif
 .if !empty(BASE_PORTS.${image}:Mpmax)
@@ -381,7 +386,7 @@
 
 cleanimages:
 .for image in ${CD_IMAGES}
-       -rm -f ${image}.iso
+       -rm -f ${IMAGEDIR}/${image}.iso
 .endfor
 
 cleanstagedir:
diff -r 845089a2b57d -r 5d1b1b7b27eb distrib/cdrom/NetBSD-1.5.mk
--- a/distrib/cdrom/NetBSD-1.5.mk       Wed Nov 29 19:47:31 2000 +0000
+++ b/distrib/cdrom/NetBSD-1.5.mk       Wed Nov 29 19:56:19 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD-1.5.mk,v 1.1 2000/11/29 16:35:03 tv Exp $
+# $NetBSD: NetBSD-1.5.mk,v 1.2 2000/11/29 19:56:19 tv Exp $
 #
 # Configuration file for the NetBSD 1.5 binary release.
 
@@ -37,10 +37,6 @@
 BOOTFILE.sparc64=      ${EXTFILEDIR}/sparc64-boot.fs
 EXTFILES.sparc64=      sparc64-boot.fs:sparc64/installation/ramdisk/ramdisk.fs.gz
 
-# BOOTFILE.sun3 is absolute
-BOOTFILE.sun3=         ${EXTFILEDIR}/sun3-boot.fs
-EXTFILES.sun3=         sun3-boot.fs:sun3/installation/miniroot/miniroot.gz
-
 # BOOTFILE.vax is absolute
 BOOTFILE.vax=          ${EXTFILEDIR}/vax.xxboot
 EXTFILES.vax=          vax.xxboot:vax/binary/sets/base.tgz,./usr/mdec/hpboot
diff -r 845089a2b57d -r 5d1b1b7b27eb distrib/cdrom/example.conf
--- a/distrib/cdrom/example.conf        Wed Nov 29 19:47:31 2000 +0000
+++ b/distrib/cdrom/example.conf        Wed Nov 29 19:56:19 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: example.conf,v 1.1 2000/11/29 16:38:21 tv Exp $
+# $NetBSD: example.conf,v 1.2 2000/11/29 19:56:19 tv Exp $
 #
 # Makefile fragment for CD sets; includes config information.
 
@@ -78,11 +78,17 @@
 #   and sparc64 machines will have to boot with "boot cdrom:g" instead of
 #   "boot cdrom".
 
-BASE_PORTS.cd1=        amiga arm32 atari hp300 i386 mac68k macppc \
-               mvme68k news68k next68k
+# Independent ports:
+#     alpha arm32 i386 macppc pc532 sparc sparc64 vax
+# m68k ports:
+#     amiga atari hp300 mac68k mvme68k news68k next68k sun3
+# mipsel ports:
+#     arc cobalt hpcmips pmax
 
-BASE_PORTS.cd2=        alpha arc cobalt hpcmips pc532 pmax sparc \
-               sparc64 vax source
+BASE_PORTS.cd1=        i386 arm32 macppc pc532 sparc sparc64 source patches
+
+BASE_PORTS.cd2= amiga atari hp300 mac68k mvme68k news68k next68k sun3 \
+               arc cobalt hpcmips pmax alpha vax
 
 ##############################################################################
 # These provide additional functionality to some host OS's that may or may
diff -r 845089a2b57d -r 5d1b1b7b27eb distrib/cdrom/hide-hfs.lst
--- a/distrib/cdrom/hide-hfs.lst        Wed Nov 29 19:47:31 2000 +0000
+++ b/distrib/cdrom/hide-hfs.lst        Wed Nov 29 19:56:19 2000 +0000
@@ -14,9 +14,11 @@
 ./hp300
 ./hpcmips
 ./i386
+./mac68k
 ./mac68k/binary/kernel
 ./mac68k/installation/misc/*.hqx
-./macppc
+./macppc/binary
+./macppc/installation
 ./mvme68k
 ./news68k
 ./next68k
Prev by Date: [src/trunk]: src/sys/dev/pci ANSI'ify.
Next by Date: [src/trunk]: src/sys/arch/alpha/alpha remove unneded opt_compat_osf1.h stuff
Previous by Thread: [src/trunk]: src/sys/dev/pci ANSI'ify.
Next by Thread: [src/trunk]: src/sys/arch/alpha/alpha remove unneded opt_compat_osf1.h stuff
Indexes:
Home | Main Index | Thread Index | Old Index