svn commit: r262518 - in projects/release-debugdist: release share/mk

[Glen Barber]

Author: gjb
Date: Wed Feb 26 01:57:55 2014
New Revision: 262518
URL: http://svnweb.freebsd.org/changeset/base/262518

Log:
  Revert r262493 (partial), r262503:
    Despite changes in r262503, setting WITHOUT_DEBUG_FILES=1 in
    release/Makefile still does not do what I want it to do.
  
    A much larger hammer is needed.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-debugdist/release/Makefile
  projects/release-debugdist/share/mk/bsd.own.mk

Modified: projects/release-debugdist/release/Makefile
==============================================================================
--- projects/release-debugdist/release/Makefile	Wed Feb 26 01:46:42 2014	(r262517)
+++ projects/release-debugdist/release/Makefile	Wed Feb 26 01:57:55 2014	(r262518)
@@ -144,8 +144,7 @@ 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 WITHOUT_ATF=1 WITHOUT_LIB32=1 \
-		WITHOUT_DEBUG_FILES=1
+		WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 WITHOUT_ATF=1 WITHOUT_LIB32=1
 # Copy distfiles
 	mkdir -p release/usr/freebsd-dist
 	for dist in MANIFEST $$(ls *.txz | grep -v 'debug'); \
@@ -171,7 +170,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 WITHOUT_DEBUG_FILES=1
+	    WITHOUT_KERNEL_SYMBOLS=1
 # Copy manifest only (no distfiles) to get checksums
 	mkdir -p bootonly/usr/freebsd-dist
 	cp MANIFEST bootonly/usr/freebsd-dist
@@ -189,8 +188,7 @@ dvd:
 # Install system
 	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-		DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
-		WITHOUT_DEBUG_FILES=1
+		DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	for dist in MANIFEST $$(ls *.txz | grep -v 'debug'); \

Modified: projects/release-debugdist/share/mk/bsd.own.mk
==============================================================================
--- projects/release-debugdist/share/mk/bsd.own.mk	Wed Feb 26 01:46:42 2014	(r262517)
+++ projects/release-debugdist/share/mk/bsd.own.mk	Wed Feb 26 01:57:55 2014	(r262518)
@@ -461,7 +461,7 @@ MK_${var}:=	yes
 # MK_* options which default to "no".
 #
 .for var in ${__DEFAULT_NO_OPTIONS}
-.if defined(WITH_${var}) && defined(WITHOUT_${var}) && ${var} != "DEBUG_FILES"
+.if defined(WITH_${var}) && defined(WITHOUT_${var})
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
 .if defined(MK_${var})