Author: marius
Date: Fri Sep 22 04:57:42 2017
New Revision: 323900
URL: https://svnweb.freebsd.org/changeset/base/323900
Log:
- Akin r302691 in head, synchronize the build stripping for the disc1
image with that of the bootonly image (but similarly modulo games
and groff(1)) as the amd64 disc1 image is overflowing. This also
removes the defunct WITHOUT_ATF.
- Remove the misspelled WITHOUT_INSTALLIB (also in place with correct
spelling, i. e. WITHOUT_INSTALLLIB) from the bootonly image build
stripping.
This is a direct commit to stable/10 as the corresponding knobs have
different names in head and counterparts to e. g. MK_DEBUG_FILES and
MK_TESTS default to off in stable/10 in the first place.
Modified:
stable/10/release/Makefile
Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile Fri Sep 22 04:41:48 2017 (r323899)
+++ stable/10/release/Makefile Fri Sep 22 04:57:42 2017 (r323900)
@@ -192,8 +192,11 @@ disc1: packagesystem
# Install system
mkdir -p ${.TARGET}
cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
- DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1
WITHOUT_KERNEL_SYMBOLS=1 \
- WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 WITHOUT_ATF=1
WITHOUT_LIB32=1
+ DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_AMD=1 WITHOUT_AT=1 \
+ WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \
+ WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \
+ WITHOUT_RESCUE=1 WITHOUT_DICT=1 \
+ WITHOUT_KERNEL_SYMBOLS=1
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
cp *.txz MANIFEST ${.TARGET}/usr/freebsd-dist
@@ -217,7 +220,7 @@ bootonly: packagesystem
WITHOUT_GAMES=1 WITHOUT_GROFF=1 \
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_RESCUE=1 WITHOUT_DICT=1 \
WITHOUT_KERNEL_SYMBOLS=1
# Copy manifest only (no distfiles) to get checksums
mkdir -p ${.TARGET}/usr/freebsd-dist
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
