svn commit: r267345 - projects/release-debugdist/release

[Glen Barber]

Author: gjb
Date: Tue Jun 10 23:22:17 2014
New Revision: 267345
URL: http://svnweb.freebsd.org/changeset/base/267345

Log:
  Remove the hammer used to remove *.debug files in the
  resulting ISO image userland.
  
  Explicitly set MK_DEBUG_FILES=no, which overrides the
  WITH_DEBUG_FILES=1 and WITHOUT_DEBUG_FILES=1 collisions
  previously experienced.
  
  This change allows us to create the {base,kernel}_debug.txz
  distributions without accidentally installing the *.debug
  files on the medium itself.
  
  Inspired by:	jmmv
  Tested on:	projects/release-debugdist at r267344
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-debugdist/release/Makefile

Modified: projects/release-debugdist/release/Makefile
==============================================================================
--- projects/release-debugdist/release/Makefile	Tue Jun 10 23:03:41 2014	(r267344)
+++ projects/release-debugdist/release/Makefile	Tue Jun 10 23:22:17 2014	(r267345)
@@ -155,7 +155,8 @@ system: packagesystem
 	mkdir -p release
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
 		DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
-		WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1
+		WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1 \
+		MK_DEBUG_FILES=no
 # Copy distfiles
 	mkdir -p release/usr/freebsd-dist
 	for dist in MANIFEST $$(ls *.txz | grep -v 'debug'); \
@@ -172,10 +173,6 @@ system: packagesystem
 	echo debug.witness.trace=0 >> release/etc/sysctl.conf
 	cp ${.CURDIR}/rc.local release/etc
 	touch ${.TARGET}
-# Apply a hammer to remove *.debug files, if they exist.
-.if defined(WITH_DEBUG_FILES)
-	find ${.OBJDIR}/release -mindepth 1 -name \*.debug -delete
-.endif
 
 bootonly: packagesystem
 # Install system
@@ -186,7 +183,7 @@ bootonly: packagesystem
 	    WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \
 	    WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \
 	    WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \
-	    WITHOUT_KERNEL_SYMBOLS=1 MK_TESTS=no
+	    WITHOUT_KERNEL_SYMBOLS=1 MK_TESTS=no MK_DEBUG_FILES=no
 # Copy manifest only (no distfiles) to get checksums
 	mkdir -p bootonly/usr/freebsd-dist
 	cp MANIFEST bootonly/usr/freebsd-dist
@@ -200,17 +197,13 @@ bootonly: packagesystem
 	echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
 	echo debug.witness.trace=0 >> bootonly/etc/sysctl.conf
 	cp ${.CURDIR}/rc.local bootonly/etc
-# Apply a hammer to remove *.debug files, if they exist.
-.if defined(WITH_DEBUG_FILES)
-	find ${.OBJDIR}/${.TARGET} -mindepth 1 -name \*.debug -delete
-.endif
 
 dvd:
 # Install system
 	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
 		DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
-		MK_TESTS=no
+		MK_TESTS=no MK_DEBUG_FILES=no
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	for dist in MANIFEST $$(ls *.txz | grep -v 'debug'); \
@@ -227,10 +220,6 @@ dvd:
 	echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
 	cp ${.CURDIR}/rc.local ${.TARGET}/etc
 	touch ${.TARGET}
-# Apply a hammer to remove *.debug files, if they exist.
-.if defined(WITH_DEBUG_FILES)
-	find ${.OBJDIR}/${.TARGET} -mindepth 1 -name \*.debug -delete
-.endif
 
 release.iso: disc1.iso
 disc1.iso: system