tech-install archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: Making install CDs contain the full sets
To pick up an ancient thread again: I managed to make this work both for
-U and non-U build.sh invocations now.
The resulting image sizes are:
454M NetBSD-7.99.13-amd64.iso
475M NetBSD-7.99.13-i386.iso
426M NetBSD-7.99.13-sparc64.iso
294M NetBSD-7.99.13-vax.iso
There is a strange chmod -R call needed, which is due to var/spool/ftp/private
being created with mode 0111, so when running unprivileged, makefs can not
add it to the iso. We could extract dirs like this from fs.spec and only chmod
those, if this should be a portability problem.
The copying of the sets via maketars could be parallelized, but since there is
no compression involved, this is already pure IO bound and likely will not
yield any overall improvements.
Comments welcome...
Martin
Index: amd64/cdroms/Makefile.cdrom
===================================================================
RCS file: /cvsroot/src/distrib/amd64/cdroms/Makefile.cdrom,v
retrieving revision 1.13
diff -u -r1.13 Makefile.cdrom
--- amd64/cdroms/Makefile.cdrom 18 Apr 2015 08:56:56 -0000 1.13
+++ amd64/cdroms/Makefile.cdrom 4 May 2015 20:10:33 -0000
@@ -11,62 +11,8 @@
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CDRUNTIME+= ./bin
-CDRUNTIME+= ./dev/MAKEDEV
-CDRUNTIME+= ./etc
-CDRUNTIME+= ./lib
-CDRUNTIME+= ./libdata
-CDRUNTIME+= ./libexec/ld.elf_so
-CDRUNTIME+= ./libexec/lfs_cleanerd
-CDRUNTIME+= ./libexec/dhcpcd-run-hooks
-CDRUNTIME+= ./libexec/resolvconf/
-CDRUNTIME+= ./mnt
-CDRUNTIME+= ./sbin
-CDRUNTIME+= ./stand
-CDRUNTIME+= ./tmp
-CDRUNTIME+= ./usr/bin/ftp
-CDRUNTIME+= ./usr/bin/grep
-CDRUNTIME+= ./usr/bin/gzip
-CDRUNTIME+= ./usr/bin/less
-CDRUNTIME+= ./usr/bin/more
-CDRUNTIME+= ./usr/bin/netstat
-CDRUNTIME+= ./usr/bin/progress
-CDRUNTIME+= ./usr/bin/sed
-CDRUNTIME+= ./usr/bin/sort
-CDRUNTIME+= ./usr/bin/tip
-CDRUNTIME+= ./usr/bin/tput
-CDRUNTIME+= ./usr/bin/vi
-CDRUNTIME+= ./usr/bin/vmstat
-.if ${MKBSDTAR} != "no"
-CDRUNTIME+= ./usr/lib/libarchive.so*
-.endif
-CDRUNTIME+= ./usr/lib/libbz2.so*
-CDRUNTIME+= ./usr/lib/libc.so*
-CDRUNTIME+= ./usr/lib/libcurses.so*
-CDRUNTIME+= ./usr/lib/libedit.so*
-CDRUNTIME+= ./usr/lib/libgcc_s.so*
-CDRUNTIME+= ./usr/lib/libintl.so*
-CDRUNTIME+= ./usr/lib/libkvm.so*
-CDRUNTIME+= ./usr/lib/liblzma.so*
-CDRUNTIME+= ./usr/lib/libpthread.so*
-CDRUNTIME+= ./usr/lib/libterminfo.so*
-CDRUNTIME+= ./usr/lib/libutil.so*
-CDRUNTIME+= ./usr/lib/libz.so*
-.if (${MKCRYPTO} != "no")
-CDRUNTIME+= ./usr/lib/libcrypto.so*
-CDRUNTIME+= ./usr/lib/libssl.so*
-.endif
-CDRUNTIME+= ./usr/libexec/ld.elf_so
-CDRUNTIME+= ./usr/libexec/getty
-CDRUNTIME+= ./usr/mdec
-CDRUNTIME+= ./usr/sbin/chroot
-CDRUNTIME+= ./usr/sbin/installboot
-CDRUNTIME+= ./usr/sbin/wiconfig
-CDRUNTIME+= ./usr/share/misc/terminfo.cdb
-CDRUNTIME+= ./usr/share/locale
-
image_md_pre:
- ${MKDIR} cdrom/etc
+ ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
Index: common/Makefile.bootcd
===================================================================
RCS file: /cvsroot/src/distrib/common/Makefile.bootcd,v
retrieving revision 1.25
diff -u -r1.25 Makefile.bootcd
--- common/Makefile.bootcd 31 May 2014 10:18:47 -0000 1.25
+++ common/Makefile.bootcd 4 May 2015 20:10:33 -0000
@@ -31,6 +31,9 @@
# CDKERNELS couples of the form:
# source name_on_cd
# CDRUNTIME files/directories to copy from $DESTDIR onto the CD
+# CD_SETS sets to be extracted onto the CD
+# (default: base modules etc)
+# SETS_DIR where the CD_SETS are found (default provided)
# source kernels are copied from ${CDINSTKERNEL} (or its obj dir)
# note that as of yet, bootxx_cd9660 can't load kernel names of more than
# 8 chars (though they can be in a sub-directory meaning the pathname is
@@ -56,11 +59,15 @@
CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp'
.endif
+CD_SETS?= base modules etc
+SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
+
.include <bsd.own.mk> # For PRINTOBJDIR
.include <bsd.kernobj.mk> # For KERNSRCDIR
DISTRIBVER!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh
DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s
+CUROBJDIR!= cd ${.CURDIR} && ${PRINTOBJDIR}
ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z
PUBLISHER?= The_NetBSD_Project
.if defined(CDMAKEFSOPTIONS)
@@ -69,6 +76,12 @@
_CDMAKEFSOPTIONS= rockridge,label=${ISO_VOLID},publisher=${PUBLISHER}
.endif
+.if ${MKUNPRIVED} == "no"
+CD_METALOG.unpriv=
+.else
+CD_METALOG.unpriv=-M ${METALOG}.sanitised
+.endif
+
# Stuff that should come from elsewhere - XXX where? - HF
CP?= cp
RM?= rm
@@ -81,10 +94,37 @@
.else
CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso
.endif
+WORKSPEC= fs.spec
+CDMAKEFSEXTRAOPTS+=-F ${WORKSPEC}
CLEANFILES+= ${CDIMAGE}
CLEANFILES+= bootxx.${MACHINE}
+CLEANFILES+= ${WORKSPEC}
+CDSETSENV= DESTDIR=${DESTDIR:Q} \
+ MACHINE=${MACHINE:Q} \
+ MACHINE_ARCH=${MACHINE_ARCH:Q} \
+ AWK=${TOOL_AWK:Q} \
+ CKSUM=${TOOL_CKSUM:Q} \
+ DB=${TOOL_DB:Q} \
+ HOST_SH=${HOST_SH:Q} \
+ MAKE=${MAKE:Q} \
+ MKTEMP=${TOOL_MKTEMP:Q} \
+ MTREE=${TOOL_MTREE:Q} \
+ PAX=${TOOL_PAX:Q} \
+ COMPRESS_PROGRAM=${COMPRESS_PROGRAM:Q} \
+ GZIP=${GZIP_FLAGS:Q} \
+ PKG_CREATE=${TOOL_PKG_CREATE:Q} \
+ SED=${TOOL_SED:Q} \
+ TSORT=${TSORT:Q} \
+ MKRUMP=no \
+ MKCOMPAT=no \
+ MKDEBUG=no \
+ MKDEBUGLIB=no
+
+CDSETSCMD= cd ${NETBSDSRCDIR}/distrib/sets && \
+ ${CDSETSENV} \
+ ${HOST_SH}
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -100,7 +140,7 @@
.endif
prepare:
- ${MKDIR} cdrom
+ ${MKDIR} "${CUROBJDIR}/cdrom"
.if defined(CDKERNELS)
.for kernel target in ${CDKERNELS}
${CP} ${_INSTKERNELNOBJDIR}/${kernel} cdrom/${target}
@@ -131,38 +171,35 @@
copy-releasedir:
${RM} -f ${RELEASEDIR}/${CDROMS_RELEASEDIR}/${CDIMAGE}
if ${CDRELEASE}; then \
- if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then \
+ if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then \
echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
exit 1; \
fi; \
- ${MKDIR} cdrom/${MACHINE}; \
- curdir=$$(pwd); \
- release_destdir=$$(pwd)/cdrom/${MACHINE}; \
+ ${MKDIR} "${CUROBJDIR}/cdrom/${MACHINE}"; \
+ release_destdir="${CUROBJDIR}/cdrom/${MACHINE}"; \
cd ${RELEASEDIR}/${RELEASEMACHINEDIR}; \
echo Copying $$(pwd) to $$release_destdir ...; \
${TOOL_PAX} \
-rw -pe ${PAX_v} \
${CDRELEASE_EXCLUDE} \
. $$release_destdir; \
- cd $$curdir; \
+ cd "${CUROBJDIR}"; \
fi
if ${CDSOURCE}; then \
if [ ! -d ${RELEASEDIR}/source ]; then \
echo "Missing ${RELEASEDIR}/source, aborting"; \
exit 1; \
fi; \
- ${MKDIR} cdrom/source; \
- curdir=$$(pwd); \
- release_destdir=$$(pwd)/cdrom/source; \
+ ${MKDIR} "${CUROBJDIR}/cdrom/source"; \
+ release_destdir="${CUROBJDIR}/cdrom/source"; \
cd ${RELEASEDIR}/source; \
echo Copying $$(pwd) to $$release_destdir ...; \
${TOOL_PAX} \
-rw -pe ${PAX_v} \
. $$release_destdir; \
- cd $$curdir; \
+ cd "${CUROBJDIR}"; \
fi
- if [ "X${CDRUNTIME}}" != "X" ]; then \
- curdir=$$(pwd); \
+ if [ "X${CDRUNTIME}" != "X" ]; then \
release_destdir=$${curdir}/cdrom; \
cd $$release_destdir; \
cd ${DESTDIR}; \
@@ -170,10 +207,9 @@
do \
${TOOL_PAX} -rw -pp ${PAX_v} $${cde} $$release_destdir;\
done; \
- cd $$curdir; \
+ cd "${CUROBJDIR}"; \
fi
if [ "X${CDEXTRA}${CDBUILDEXTRA}" != "X" ]; then \
- curdir=`pwd`; \
skipflag=""; \
cdextra_skip="${CDEXTRA_SKIP}"; \
if [ "X$${cdextra_skip}" != "X" ]; then \
@@ -182,13 +218,13 @@
do \
echo $${skip} >> cdskip; \
done; \
- skipflag="-X $${curdir}/cdskip"; \
+ skipflag="-X ${CUROBJDIR:Q}/cdskip"; \
fi; \
cdextra="${CDEXTRA}"; \
cdbuildextra="${CDBUILDEXTRA}"; \
for cde in $${cdextra} $${cdbuildextra}; \
do \
- release_destdir=$${curdir}/cdrom; \
+ release_destdir="${CUROBJDIR}/cdrom"; \
if [ -f $${cde} ]; then \
echo Copying $${cde} to $$release_destdir ...; \
${CP} $${cde} $${release_destdir}; \
@@ -202,11 +238,36 @@
echo "Missing $${cde}, aborting"; \
exit 1; \
fi; \
- cd $$curdir; \
+ cd "${CUROBJDIR}"; \
done; \
fi
+ ${MKDIR} "${CUROBJDIR}/cdrom/etc/mtree"
+.for set in ${CD_SETS}
+ ${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom" \
+ ${CD_METALOG.unpriv} -N ${NETBSDSRCDIR}/etc \
+ -F "${CUROBJDIR}/cdrom/etc/mtree" \
+ -d "${DESTDIR:S,^$,/,}" ${set}
+ ${CHMOD} -R u+rw "${CUROBJDIR}/cdrom"
+.endfor
image:
+ @echo Preparing spec files for makefs...
+ ${RM} -f ${WORKSPEC}
+ cat cdrom/etc/mtree/* | \
+ ${TOOL_SED} -e 's/ size=[0-9]*//' \
+ -e '/^\.\/etc\/gettytab/d' > ${WORKSPEC}
+ ${HOST_SH} cdrom/dev/MAKEDEV -s all | \
+ ${TOOL_SED} -e '/^\. type=dir/d' -e 's,^\.,./dev,' >> ${WORKSPEC}
+.if defined(SPEC_IN)
+ cat ${SPEC_IN} >> ${WORKSPEC}
+.endif
+.if defined(SECONDARY_BOOT)
+ echo "./${SECONDARY_BOOT} type=file uname=root gname=wheel mode=0444" \
+ >> ${WORKSPEC}
+.endif
+.if defined(SPEC_EXTRA)
+ cat ${SPEC_EXTRA} >> ${WORKSPEC}
+.endif
${TOOL_MAKEFS} -t cd9660 ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
Index: i386/cdroms/Makefile.cdrom
===================================================================
RCS file: /cvsroot/src/distrib/i386/cdroms/Makefile.cdrom,v
retrieving revision 1.33
diff -u -r1.33 Makefile.cdrom
--- i386/cdroms/Makefile.cdrom 18 Apr 2015 08:56:57 -0000 1.33
+++ i386/cdroms/Makefile.cdrom 4 May 2015 20:10:33 -0000
@@ -11,62 +11,8 @@
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CDRUNTIME+= ./bin
-CDRUNTIME+= ./dev/MAKEDEV
-CDRUNTIME+= ./etc
-CDRUNTIME+= ./lib
-CDRUNTIME+= ./libdata
-CDRUNTIME+= ./libexec/ld.elf_so
-CDRUNTIME+= ./libexec/lfs_cleanerd
-CDRUNTIME+= ./libexec/dhcpcd-run-hooks
-CDRUNTIME+= ./libexec/resolvconf/
-CDRUNTIME+= ./mnt
-CDRUNTIME+= ./sbin
-CDRUNTIME+= ./stand
-CDRUNTIME+= ./tmp
-CDRUNTIME+= ./usr/bin/ftp
-CDRUNTIME+= ./usr/bin/grep
-CDRUNTIME+= ./usr/bin/gzip
-CDRUNTIME+= ./usr/bin/less
-CDRUNTIME+= ./usr/bin/more
-CDRUNTIME+= ./usr/bin/netstat
-CDRUNTIME+= ./usr/bin/progress
-CDRUNTIME+= ./usr/bin/sed
-CDRUNTIME+= ./usr/bin/sort
-CDRUNTIME+= ./usr/bin/tip
-CDRUNTIME+= ./usr/bin/tput
-CDRUNTIME+= ./usr/bin/vi
-CDRUNTIME+= ./usr/bin/vmstat
-.if ${MKBSDTAR} != "no"
-CDRUNTIME+= ./usr/lib/libarchive.so*
-.endif
-CDRUNTIME+= ./usr/lib/libbz2.so*
-CDRUNTIME+= ./usr/lib/libc.so*
-CDRUNTIME+= ./usr/lib/libcurses.so*
-CDRUNTIME+= ./usr/lib/libedit.so*
-CDRUNTIME+= ./usr/lib/libgcc_s.so*
-CDRUNTIME+= ./usr/lib/libintl.so*
-CDRUNTIME+= ./usr/lib/libkvm.so*
-CDRUNTIME+= ./usr/lib/liblzma.so*
-CDRUNTIME+= ./usr/lib/libpthread.so*
-CDRUNTIME+= ./usr/lib/libterminfo.so*
-CDRUNTIME+= ./usr/lib/libutil.so*
-CDRUNTIME+= ./usr/lib/libz.so*
-.if (${MKCRYPTO} != "no")
-CDRUNTIME+= ./usr/lib/libcrypto.so*
-CDRUNTIME+= ./usr/lib/libssl.so*
-.endif
-CDRUNTIME+= ./usr/libexec/ld.elf_so
-CDRUNTIME+= ./usr/libexec/getty
-CDRUNTIME+= ./usr/mdec
-CDRUNTIME+= ./usr/sbin/chroot
-CDRUNTIME+= ./usr/sbin/installboot
-CDRUNTIME+= ./usr/sbin/wiconfig
-CDRUNTIME+= ./usr/share/misc/terminfo.cdb
-CDRUNTIME+= ./usr/share/locale
-
image_md_pre:
- ${MKDIR} cdrom/etc
+ ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
Index: sparc/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/sparc/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- sparc/Makefile 22 Jan 2012 03:53:33 -0000 1.8
+++ sparc/Makefile 4 May 2015 20:10:33 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.8 2012/01/22 03:53:33 tsutsui Exp $
-SUBDIR= instfs ramdisk .WAIT bootfs .WAIT cdroms liveimage
+SUBDIR= instfs ramdisk .WAIT bootfs instkern .WAIT cdroms liveimage
TARGETS+= release
iso_image:
Index: sparc64/cdroms/installcd/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/sparc64/cdroms/installcd/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- sparc64/cdroms/installcd/Makefile 18 Apr 2015 08:56:57 -0000 1.21
+++ sparc64/cdroms/installcd/Makefile 4 May 2015 20:10:33 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.21 2015/04/18 08:56:57 martin Exp $
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd
# for PRINTOBJDIR
.include <bsd.own.mk>
@@ -12,64 +13,8 @@
CDBOOTIMAGE= ${CDBOOTIMAGEDIR}/boot.fs
SUN_BOOT_ARGS:= - - - - ${CDBOOTIMAGE}
-CDRUNTIME+= ./bin
-CDRUNTIME+= ./dev/MAKEDEV
-CDRUNTIME+= ./etc
-CDRUNTIME+= ./lib
-CDRUNTIME+= ./libdata
-CDRUNTIME+= ./libexec
-CDRUNTIME+= ./mnt
-CDRUNTIME+= ./sbin
-# CDRUNTIME+= ./stand
-CDRUNTIME+= ./tmp
-CDRUNTIME+= ./usr/bin/ftp
-CDRUNTIME+= ./usr/bin/getopt
-CDRUNTIME+= ./usr/bin/gunzip
-CDRUNTIME+= ./usr/bin/gzcat
-CDRUNTIME+= ./usr/bin/gzip
-CDRUNTIME+= ./usr/bin/grep
-CDRUNTIME+= ./usr/bin/less
-CDRUNTIME+= ./usr/bin/more
-CDRUNTIME+= ./usr/bin/netstat
-CDRUNTIME+= ./usr/bin/progress
-CDRUNTIME+= ./usr/bin/sed
-CDRUNTIME+= ./usr/bin/sort
-CDRUNTIME+= ./usr/bin/tip
-CDRUNTIME+= ./usr/bin/tput
-CDRUNTIME+= ./usr/bin/vi
-CDRUNTIME+= ./usr/bin/vmstat
-.if ${MKBSDTAR} != "no"
-CDRUNTIME+= ./usr/lib/libarchive.so*
-.endif
-CDRUNTIME+= ./usr/lib/libbz2.so*
-CDRUNTIME+= ./usr/lib/libc.so*
-CDRUNTIME+= ./usr/lib/libcurses.so*
-CDRUNTIME+= ./usr/lib/libedit.so*
-CDRUNTIME+= ./usr/lib/libgcc_s.so*
-CDRUNTIME+= ./usr/lib/libintl.so*
-CDRUNTIME+= ./usr/lib/libkvm.so*
-CDRUNTIME+= ./usr/lib/liblzma.so*
-CDRUNTIME+= ./usr/lib/libpthread.so*
-CDRUNTIME+= ./usr/lib/libterminfo.so*
-CDRUNTIME+= ./usr/lib/libutil.so*
-CDRUNTIME+= ./usr/lib/libz.so*
-.if (${MKCRYPTO} != "no")
-CDRUNTIME+= ./usr/lib/libcrypto.so*
-CDRUNTIME+= ./usr/lib/libssl.so*
-.endif
-CDRUNTIME+= ./usr/libexec/ld.elf_so
-CDRUNTIME+= ./usr/libexec/getty
-CDRUNTIME+= ./usr/mdec
-CDRUNTIME+= ./usr/sbin/chat
-CDRUNTIME+= ./usr/sbin/chroot
-CDRUNTIME+= ./usr/sbin/installboot
-CDRUNTIME+= ./usr/sbin/pppd
-CDRUNTIME+= ./usr/sbin/wiconfig
-CDRUNTIME+= ./usr/share/misc/terminfo.cdb
-CDRUNTIME+= ./usr/share/locale
-
image_md_pre:
- ${MKDIR} cdrom/etc
+ ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
@@ -79,14 +24,11 @@
for f in ${SYSINSTDIR}/sysinstmsgs.??; do \
${INSTALL} ${COPY} $$f cdrom; \
done
- ${MKDIR} cdrom/var
- ${MKDIR} cdrom/kern
- ${CP} ${RELEASEDIR}/sparc64/binary/kernel/netbsd-GENERIC.gz cdrom/netbsd
image_md_post:
SUNLABEL=${TOOL_SUNLABEL:Q} \
${HOST_SH} ${NETBSDSRCDIR}/distrib/common/sunbootcd.sh \
${CDIMAGE} ${SUN_BOOT_ARGS}
-
.include "${.CURDIR}/../../../common/Makefile.bootcd"
+
Index: vax/cdroms/installcd/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/vax/cdroms/installcd/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- vax/cdroms/installcd/Makefile 18 Apr 2015 08:56:56 -0000 1.11
+++ vax/cdroms/installcd/Makefile 4 May 2015 20:10:34 -0000
@@ -3,9 +3,7 @@
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
CDRELEASE_NOISOS=true
-CDMAKEFSEXTRAOPTS+=-F ./fs.spec
-
-CLEANFILES+= fs.spec
+CD_SETS= base etc # no modules for VAX
# for PRINTOBJDIR
.include <bsd.own.mk>
@@ -17,7 +15,7 @@
${CP} ${DESTDIR}/usr/mdec/boot cdrom/boot
${RM} -f bootxx.${MACHINE}
${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
- ${MKDIR} cdrom/etc
+ ${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
@@ -28,70 +26,9 @@
${INSTALL} ${COPY} $$f cdrom; \
done
${TOOL_GZIP} -d -f cdrom/netbsd.gz
- echo '. type=dir optional' > ./fs.spec
- echo './dev type=dir optional' >> ./fs.spec
- ${HOST_SH} cdrom/dev/MAKEDEV -s all | ${TOOL_SED} -e '1d' -e 's:^\./:./dev/:' >> ./fs.spec
- ${MKDIR} cdrom/var
- ${MKDIR} cdrom/kern
# make the CD bootable
image_md_post:
${TOOL_INSTALLBOOT} -m${MACHINE} ${CDIMAGE} bootxx.${MACHINE}
-CDRUNTIME+= ./bin
-CDRUNTIME+= ./dev/MAKEDEV
-CDRUNTIME+= ./etc
-CDRUNTIME+= ./lib
-CDRUNTIME+= ./libdata
-CDRUNTIME+= ./libexec
-CDRUNTIME+= ./mnt
-CDRUNTIME+= ./sbin
-# CDRUNTIME+= ./stand
-CDRUNTIME+= ./tmp
-CDRUNTIME+= ./usr/bin/ftp
-CDRUNTIME+= ./usr/bin/getopt
-CDRUNTIME+= ./usr/bin/gunzip
-CDRUNTIME+= ./usr/bin/gzcat
-CDRUNTIME+= ./usr/bin/gzip
-CDRUNTIME+= ./usr/bin/grep
-CDRUNTIME+= ./usr/bin/less
-CDRUNTIME+= ./usr/bin/more
-CDRUNTIME+= ./usr/bin/netstat
-CDRUNTIME+= ./usr/bin/progress
-CDRUNTIME+= ./usr/bin/sed
-CDRUNTIME+= ./usr/bin/sort
-CDRUNTIME+= ./usr/bin/tip
-CDRUNTIME+= ./usr/bin/tput
-CDRUNTIME+= ./usr/bin/vi
-CDRUNTIME+= ./usr/bin/vmstat
-.if ${MKBSDTAR} != "no"
-CDRUNTIME+= ./usr/lib/libarchive.so*
-.endif
-CDRUNTIME+= ./usr/lib/libbz2.so*
-CDRUNTIME+= ./usr/lib/libc.so*
-CDRUNTIME+= ./usr/lib/libcurses.so*
-CDRUNTIME+= ./usr/lib/libedit.so*
-CDRUNTIME+= ./usr/lib/libgcc_s.so*
-CDRUNTIME+= ./usr/lib/libintl.so*
-CDRUNTIME+= ./usr/lib/libkvm.so*
-CDRUNTIME+= ./usr/lib/liblzma.so*
-CDRUNTIME+= ./usr/lib/libpthread.so*
-CDRUNTIME+= ./usr/lib/libterminfo.so*
-CDRUNTIME+= ./usr/lib/libutil.so*
-CDRUNTIME+= ./usr/lib/libz.so*
-.if (${MKCRYPTO} != "no")
-CDRUNTIME+= ./usr/lib/libcrypto.so*
-CDRUNTIME+= ./usr/lib/libssl.so*
-.endif
-CDRUNTIME+= ./usr/libexec/ld.elf_so
-CDRUNTIME+= ./usr/libexec/getty
-CDRUNTIME+= ./usr/mdec
-CDRUNTIME+= ./usr/sbin/chat
-CDRUNTIME+= ./usr/sbin/chroot
-CDRUNTIME+= ./usr/sbin/installboot
-CDRUNTIME+= ./usr/sbin/pppd
-CDRUNTIME+= ./usr/sbin/wiconfig
-CDRUNTIME+= ./usr/share/misc/terminfo.cdb
-CDRUNTIME+= ./usr/share/locale
-
.include "${.CURDIR}/../../../common/Makefile.bootcd"
Home |
Main Index |
Thread Index |
Old Index