diff options
| author | gjb <gjb@FreeBSD.org> | 2016-07-19 16:22:50 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-07-19 16:22:50 +0000 |
| commit | 3760c494321b25497428e91014ec0883ec849117 (patch) | |
| tree | c1eacddd7cf00b76aaafb3c9937b00587d074e2b | |
| parent | 9a5d5ad86e4479378293a6598ce3e086d8abf1a8 (diff) | |
| download | FreeBSD-src-3760c494321b25497428e91014ec0883ec849117.zip FreeBSD-src-3760c494321b25497428e91014ec0883ec849117.tar.gz | |
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
| -rw-r--r-- | release/Makefile | 7 | ||||
| -rwxr-xr-x | release/scripts/make-manifest.sh | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile index 9be27b8..0ff9e1c 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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 diff --git a/release/scripts/make-manifest.sh b/release/scripts/make-manifest.sh index 79cea70..2d40e8c 100755 --- a/release/scripts/make-manifest.sh +++ b/release/scripts/make-manifest.sh @@ -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 |
