Author: kensmith
Date: Wed Oct 22 15:39:28 2008
New Revision: 184166
URL: http://svn.freebsd.org/changeset/base/184166
Log:
MFC r184144 and r184145. Replace an @ that went missing and move an
echo that accidentally got wrapped in the MAKE_DVD knob.
Approved by: re (kib)
Modified:
stable/7/release/ (props changed)
stable/7/release/Makefile
stable/7/release/scripts/src-install.sh (props changed)
Modified: stable/7/release/Makefile
==============================================================================
--- stable/7/release/Makefile Wed Oct 22 15:27:59 2008 (r184165)
+++ stable/7/release/Makefile Wed Oct 22 15:39:28 2008 (r184166)
@@ -959,13 +959,13 @@ cdrom.1:
@rm -f ${CD_LIVEFS}/boot/device.hints
@cp ${RD}/trees/base/boot/device.hints ${CD_LIVEFS}/boot/device.hints
.endif
+ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
.if defined(MAKE_DVD)
@cp -Rp ${RD}/kernels/GENERIC/ ${CD_DVD1}/boot/kernel
@rm -f ${CD_DVD1}/boot/kernel/*.symbols
@rm -f ${CD_DVD1}/.profile
@cp ${.CURDIR}/fixit.profile ${CD_DVD1}/.profile
@ln -sf /rescue ${CD_DVD1}/stand
- @echo "CD_VERSION = ${BUILDNAME}" > ${CD_LIVEFS}/cdrom.inf
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DVD1}/cdrom.inf
@rm -f ${CD_DVD1}/boot/loader.conf
@cp ${RD}/mfsroot/mfsroot.gz ${CD_DVD1}/boot/mfsroot.gz
@@ -1039,7 +1039,7 @@ cdrom.2:
@echo "CD_VOLUME = 1" >> ${CD_DVD1}/cdrom.inf
.endif
.if !defined(NODOC)
- echo "Building CDROM docs filesystem image"
+ @echo "Building CDROM docs filesystem image"
@mkdir -p ${CD_DOCS}
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf
@mkdir -p ${CD_DOCS}/usr/share/doc
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
