svn commit: r303027 - in stable/11/release: . scripts

[Glen Barber]

Author: gjb
Date: Tue Jul 19 16:22:50 2016
New Revision: 303027
URL: https://svnweb.freebsd.org/changeset/base/303027

Log:
  Reduce the disc1.iso size from 850+M to just over 650M.
  
  As a result of this change, the 'kernel-dbg.txz' distribution
  is no longer provided on disc1.iso, and deselected by default
  in bsdinstall(8).  When 'kernel-dbg.txz' is selected, network
  configuration happens before the installer proceeds, to fetch
  the distribution from the mirrors.
  
  This is a direct commit to stable/11, as there is intention
  to solve this differently for 12.0-RELEASE.
  
  Reviewed by:	nwhitehorn (glanced at)
  Approved by:	re (hrs)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/Makefile
  stable/11/release/scripts/make-manifest.sh

Modified: stable/11/release/Makefile
==============================================================================
--- stable/11/release/Makefile	Tue Jul 19 16:02:07 2016	(r303026)
+++ stable/11/release/Makefile	Tue Jul 19 16:22:50 2016	(r303027)
@@ -172,11 +172,12 @@ disc1: packagesystem
 	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
+		MK_PROFILE=no MK_MAIL=no MK_TESTS=no MK_LIB32=no \
+		MK_DEBUG_FILES=no MK_LLDB=no \
+		MK_TOOLCHAIN=no
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
-	for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \
+	for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32|kernel)-dbg'); \
 	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
 	done
 # Copy documentation, if generated

Modified: stable/11/release/scripts/make-manifest.sh
==============================================================================
--- stable/11/release/scripts/make-manifest.sh	Tue Jul 19 16:02:07 2016	(r303026)
+++ stable/11/release/scripts/make-manifest.sh	Tue Jul 19 16:22:50 2016	(r303027)
@@ -36,7 +36,7 @@ default_tests=off
 default_base_dbg=off
 default_lib32_dbg=off
 default_kernel_alt=off
-default_kernel_dbg=on
+default_kernel_dbg=off
 default_kernel_alt_dbg=off
 
 for i in ${*}; do