svn commit: r184145 - head/release

Ken Smith kensmith at FreeBSD.org
Tue Oct 21 23:36:29 UTC 2008


Author: kensmith
Date: Tue Oct 21 23:36:28 2008
New Revision: 184145
URL: http://svn.freebsd.org/changeset/base/184145

Log:
  Move an echo that accidentally got put under the .if defined(MAKE_DVD).
  
  Pointy hat:	kensmith

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Tue Oct 21 22:50:01 2008	(r184144)
+++ head/release/Makefile	Tue Oct 21 23:36:28 2008	(r184145)
@@ -957,13 +957,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


More information about the svn-src-all mailing list