Revert previous untill fallout has been fixed.

This commit is contained in:
martin 2015-05-19 06:58:52 +00:00
parent 445ccb6af2
commit dd29c6c2e1
6 changed files with 260 additions and 92 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cdrom,v 1.14 2015/05/18 06:25:04 martin Exp $
# $NetBSD: Makefile.cdrom,v 1.15 2015/05/19 06:58:52 martin Exp $
.include <bsd.own.mk>
@ -11,8 +11,62 @@ CDINSTKERNEL= ../../instkernel
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:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.bootcd,v 1.26 2015/05/18 06:25:04 martin Exp $
# $NetBSD: Makefile.bootcd,v 1.27 2015/05/19 06:58:52 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@ -31,9 +31,6 @@
# 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
@ -59,15 +56,11 @@ CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
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)
@ -76,12 +69,6 @@ _CDMAKEFSOPTIONS= rockridge,label=${ISO_VOLID},publisher=${PUBLISHER},${CDMAKEFS
_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
@ -94,37 +81,10 @@ CDIMAGE= ${CDBASE}.iso
.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"
@ -140,7 +100,7 @@ BOOT2=boot
.endif
prepare:
${MKDIR} "${CUROBJDIR}/cdrom"
${MKDIR} cdrom
.if defined(CDKERNELS)
.for kernel target in ${CDKERNELS}
${CP} ${_INSTKERNELNOBJDIR}/${kernel} cdrom/${target}
@ -171,35 +131,38 @@ PAX_v?=
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} "${CUROBJDIR}/cdrom/${MACHINE}"; \
release_destdir="${CUROBJDIR}/cdrom/${MACHINE}"; \
${MKDIR} cdrom/${MACHINE}; \
curdir=$$(pwd); \
release_destdir=$$(pwd)/cdrom/${MACHINE}; \
cd ${RELEASEDIR}/${RELEASEMACHINEDIR}; \
echo Copying $$(pwd) to $$release_destdir ...; \
${TOOL_PAX} \
-rw -pe ${PAX_v} \
${CDRELEASE_EXCLUDE} \
. $$release_destdir; \
cd "${CUROBJDIR}"; \
cd $$curdir; \
fi
if ${CDSOURCE}; then \
if [ ! -d ${RELEASEDIR}/source ]; then \
echo "Missing ${RELEASEDIR}/source, aborting"; \
exit 1; \
fi; \
${MKDIR} "${CUROBJDIR}/cdrom/source"; \
release_destdir="${CUROBJDIR}/cdrom/source"; \
${MKDIR} cdrom/source; \
curdir=$$(pwd); \
release_destdir=$$(pwd)/cdrom/source; \
cd ${RELEASEDIR}/source; \
echo Copying $$(pwd) to $$release_destdir ...; \
${TOOL_PAX} \
-rw -pe ${PAX_v} \
. $$release_destdir; \
cd "${CUROBJDIR}"; \
cd $$curdir; \
fi
if [ "X${CDRUNTIME}" != "X" ]; then \
if [ "X${CDRUNTIME}}" != "X" ]; then \
curdir=$$(pwd); \
release_destdir=$${curdir}/cdrom; \
cd $$release_destdir; \
cd ${DESTDIR}; \
@ -207,9 +170,10 @@ copy-releasedir:
do \
${TOOL_PAX} -rw -pp ${PAX_v} $${cde} $$release_destdir;\
done; \
cd "${CUROBJDIR}"; \
cd $$curdir; \
fi
if [ "X${CDEXTRA}${CDBUILDEXTRA}" != "X" ]; then \
curdir=`pwd`; \
skipflag=""; \
cdextra_skip="${CDEXTRA_SKIP}"; \
if [ "X$${cdextra_skip}" != "X" ]; then \
@ -218,13 +182,13 @@ copy-releasedir:
do \
echo $${skip} >> cdskip; \
done; \
skipflag="-X ${CUROBJDIR:Q}/cdskip"; \
skipflag="-X $${curdir}/cdskip"; \
fi; \
cdextra="${CDEXTRA}"; \
cdbuildextra="${CDBUILDEXTRA}"; \
for cde in $${cdextra} $${cdbuildextra}; \
do \
release_destdir="${CUROBJDIR}/cdrom"; \
release_destdir=$${curdir}/cdrom; \
if [ -f $${cde} ]; then \
echo Copying $${cde} to $$release_destdir ...; \
${CP} $${cde} $${release_destdir}; \
@ -238,36 +202,11 @@ copy-releasedir:
echo "Missing $${cde}, aborting"; \
exit 1; \
fi; \
cd "${CUROBJDIR}"; \
cd $$curdir; \
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}
.endfor
${CHMOD} +r "${CUROBJDIR}/cdrom/var/spool/ftp/hidden"
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

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cdrom,v 1.34 2015/05/18 06:25:05 martin Exp $
# $NetBSD: Makefile.cdrom,v 1.35 2015/05/19 06:58:52 martin Exp $
.include <bsd.own.mk>
@ -11,8 +11,62 @@ CDINSTKERNEL= ../../instkernel
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:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.9 2015/05/18 06:25:05 martin Exp $
# $NetBSD: Makefile,v 1.10 2015/05/19 06:58:52 martin Exp $
SUBDIR= instfs ramdisk .WAIT bootfs instkern .WAIT cdroms liveimage
SUBDIR= instfs ramdisk .WAIT bootfs .WAIT cdroms liveimage
TARGETS+= release
iso_image:

View File

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.22 2015/05/18 06:25:05 martin Exp $
# $NetBSD: Makefile,v 1.23 2015/05/19 06:58:52 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>
@ -13,8 +12,64 @@ CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc64/bootfs && ${PRINTOBJDIR}
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:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
@ -24,11 +79,14 @@ image_md_pre:
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"

View File

@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.12 2015/05/18 06:25:05 martin Exp $
# $NetBSD: Makefile,v 1.13 2015/05/19 06:58:52 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
CDRELEASE_NOISOS=true
CD_SETS= base etc # no modules for VAX
CDMAKEFSEXTRAOPTS+=-F ./fs.spec
CLEANFILES+= fs.spec
# for PRINTOBJDIR
.include <bsd.own.mk>
@ -15,7 +17,7 @@ image_md_pre:
${CP} ${DESTDIR}/usr/mdec/boot cdrom/boot
${RM} -f bootxx.${MACHINE}
${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${MKDIR} cdrom/etc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
@ -26,9 +28,70 @@ image_md_pre:
${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"