[src/trunk]: src/distrib/cdrom Clean up hidden files a bit.

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

details:   https://anonhg.NetBSD.org/src/rev/a9fc2f689794
branches:  trunk
changeset: 499806:a9fc2f689794
user:      tv <tv%NetBSD.org@localhost>
date:      Thu Nov 30 00:04:08 2000 +0000

description:
Clean up hidden files a bit.
Give sensible HFS types to some file extensions.
Fix alpha kernel to be a link, not gzip extraction.

diffstat:

 distrib/cdrom/Makefile      |  13 +++++++------
 distrib/cdrom/NetBSD-1.5.mk |   4 ++--
 distrib/cdrom/hfsmap.lst    |   7 +++++++
 distrib/cdrom/hide-hfs.lst  |  26 ++------------------------
 distrib/cdrom/hide-iso.lst  |   1 -
 5 files changed, 18 insertions(+), 33 deletions(-)

diffs (119 lines):

diff -r 2fa3a5a7ad41 -r a9fc2f689794 distrib/cdrom/Makefile
--- a/distrib/cdrom/Makefile    Wed Nov 29 22:09:05 2000 +0000
+++ b/distrib/cdrom/Makefile    Thu Nov 30 00:04:08 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/11/29 19:56:19 tv Exp $
+# $NetBSD: Makefile,v 1.3 2000/11/30 00:04:08 tv Exp $
 #
 # Consult "*.conf" for the configuration variables; this Makefile is typically
 # not edited for basic configuration changes.
@@ -30,8 +30,8 @@
 CD_RELEASE?=
 RELEASENAME=           NetBSD-${CD_RELEASE}
 MKISOFS_ARGS=          -f -A "NetBSD ${CD_RELEASE}" \
-                       -hide-list ${.CURDIR}/hide-iso.lst \
                        -hide-rr-moved -m Split -m cdrom
+#                      -hide-list ${.CURDIR}/hide-iso.lst
 
 ALL_PORTS=
 .for image in ${CD_IMAGES}
@@ -183,9 +183,10 @@
 
 .if !empty(ports:Mmacppc)
 MKISOFS_ARGS.${image}+=        -hfs -part -hide-hfs-list ${.CURDIR}/hide-hfs.lst \
-                       --macbin -boot-hfs-file ${MACPPC_IBOOTDIR}/macppcboot.raw
+                       --macbin -map ${.CURDIR}/hfsmap.lst \
+                       -boot-hfs-file ${MACPPC_IBOOTDIR}/macppcboot.raw
 .elif defined(USE_APPLE_ISO) || !empty(ports:Mmac68k)
-MKISOFS_ARGS.${image}+=        -apple --macbin
+MKISOFS_ARGS.${image}+=        -apple --macbin -map ${.CURDIR}/hfsmap.lst
 .endif
 
 # Sun (sparc, sparc64, sun3)
@@ -257,7 +258,7 @@
 ##### File extract rule #####
 
 USE-FILE: .USE
-       @case $> in \
+       @if [ ! -r $@ ]; then case $> in \
                /*,link) \
                        echo "ln -sf ${>:S/,link$//} $@"; \
                        ln -sf ${>:S/,link$//} $@;; \
@@ -269,7 +270,7 @@
                        tar --fast-read -xzOf ${>:C/,.*$//} ${>:C/^.*,//} >$@;; \
                *.gz) echo "gunzip -c <$> >$@"; gunzip -c <$> >$@;; \
                *) echo "Unknown archive method for $@"; false;; \
-       esac
+       esac; else true; fi
 
 ##### Makefile rules #####
 
diff -r 2fa3a5a7ad41 -r a9fc2f689794 distrib/cdrom/NetBSD-1.5.mk
--- a/distrib/cdrom/NetBSD-1.5.mk       Wed Nov 29 22:09:05 2000 +0000
+++ b/distrib/cdrom/NetBSD-1.5.mk       Thu Nov 30 00:04:08 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD-1.5.mk,v 1.2 2000/11/29 19:56:19 tv Exp $
+# $NetBSD: NetBSD-1.5.mk,v 1.3 2000/11/30 00:04:08 tv Exp $
 #
 # Configuration file for the NetBSD 1.5 binary release.
 
@@ -8,7 +8,7 @@
 # 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 \
+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
diff -r 2fa3a5a7ad41 -r a9fc2f689794 distrib/cdrom/hfsmap.lst
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/cdrom/hfsmap.lst  Thu Nov 30 00:04:08 2000 +0000
@@ -0,0 +1,7 @@
+.hqx - 'BnHq' 'TEXT'
+.txt - 'ttxt' 'TEXT'
+.ps - 'ASPS' 'TEXT'
+.gz - 'GNUz' 'TEXT'
+.tgz - 'GNUz' 'TEXT'
+.html - 'nbsd' 'TEXT'
+* - 'nbsd' 'TEXT'
diff -r 2fa3a5a7ad41 -r a9fc2f689794 distrib/cdrom/hide-hfs.lst
--- a/distrib/cdrom/hide-hfs.lst        Wed Nov 29 22:09:05 2000 +0000
+++ b/distrib/cdrom/hide-hfs.lst        Thu Nov 30 00:04:08 2000 +0000
@@ -3,29 +3,7 @@
 MD5
 SYSVSUM
 TRANS.TBL
+INSTALL.more
 ./boot*
 ./netbsd*
-./alpha
-./amiga
-./arc
-./arm32
-./atari
-./cobalt
-./hp300
-./hpcmips
-./i386
-./mac68k
-./mac68k/binary/kernel
-./mac68k/installation/misc/*.hqx
-./macppc/binary
-./macppc/installation
-./mvme68k
-./news68k
-./next68k
-./pc532
-./pmax
-./sparc
-./sparc64
-./sun3
-./sun3x
-./vax
+./packages
diff -r 2fa3a5a7ad41 -r a9fc2f689794 distrib/cdrom/hide-iso.lst
--- a/distrib/cdrom/hide-iso.lst        Wed Nov 29 22:09:05 2000 +0000
+++ b/distrib/cdrom/hide-iso.lst        Thu Nov 30 00:04:08 2000 +0000
@@ -1,1 +0,0 @@
-./mac68k/installation/misc/*.bin