diff options
| author | marius <marius@FreeBSD.org> | 2017-09-22 04:57:42 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2017-09-22 04:57:42 +0000 |
| commit | a3c81b6ad82652cfa97c5a0a84cd99c1ed1a0cae (patch) | |
| tree | 5787e226606c175e4b96b19272715f2b64137b9e | |
| parent | af2751ed9fdfb8d9efe2f9b32ccb402ab5f94756 (diff) | |
| download | FreeBSD-src-a3c81b6ad82652cfa97c5a0a84cd99c1ed1a0cae.zip FreeBSD-src-a3c81b6ad82652cfa97c5a0a84cd99c1ed1a0cae.tar.gz | |
- 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.
| -rw-r--r-- | release/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index 3bf618a..24fffbe 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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 |
