From 4c0ef5db052216f063379a5814bc66f0ea4bf027 Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 13 Jul 2016 02:07:36 +0000
Subject: [PATCH] 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
---
 release/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 60a86c734f07..e83755528804 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -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'); \