svn commit: r302691 - head/release

[Nathan Whitehorn]

Author: nwhitehorn
Date: Wed Jul 13 02:07:36 2016
New Revision: 302691
URL: https://svnweb.freebsd.org/changeset/base/302691

Log:
  Reduce the set of things on the disc1 image to those on the bootonly image.
  Notably, this removes the toolchain from the CD-ROM image (it remains on DVD
  images) and pushes the CD-ROM image well below the 700 MB mark.
  
  MFC after:	10 days

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Wed Jul 13 01:35:53 2016	(r302690)
+++ head/release/Makefile	Wed Jul 13 02:07:36 2016	(r302691)
@@ -171,9 +171,11 @@ disc1: packagesystem
 # Install system
 	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-		DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
-		MK_PROFILE=no MK_SENDMAIL=no MK_TESTS=no MK_LIB32=no \
-		MK_DEBUG_FILES=no
+	    DESTDIR=${.OBJDIR}/${.TARGET} MK_AMD=no MK_AT=no \
+	    MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
+	    MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
+	    MK_RESCUE=no MK_DICT=no \
+	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \