diff options
| author | gjb <gjb@FreeBSD.org> | 2014-06-14 01:03:24 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-06-14 01:03:24 +0000 |
| commit | 9b3c9d611e2960832009e8f126f005d43a18ee9d (patch) | |
| tree | 51fc2128471978872335144d0f9fec15982a101c /release/Makefile | |
| parent | 068fd5e361c66abe87e8974d68bc9bbba6b1be65 (diff) | |
| download | FreeBSD-src-9b3c9d611e2960832009e8f126f005d43a18ee9d.zip FreeBSD-src-9b3c9d611e2960832009e8f126f005d43a18ee9d.tar.gz | |
Switch release/Makefile knobs from WITHOUT_FOO=1 to MK_FOO=no.
This allows greater granular control over the release
build, and avoids WITH_FOO=1 and WITHOUT_FOO=1 collision.
This change was verified to produce correct results
compared to an earlier build by diffing find(1) output
of the resulting bootonly/, dvd/, and release/ directories.
Tested on: head@r267449
MFC after: 1 month
X-MFC-Note: Requires commits not yet MFC'd, so likely
longer than 1 month.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/release/Makefile b/release/Makefile index 2e31ae9..2fdaba9 100644 --- a/release/Makefile +++ b/release/Makefile @@ -154,8 +154,8 @@ system: packagesystem # Install system mkdir -p release cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ - WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1 + DESTDIR=${.OBJDIR}/release MK_RESCUE=no MK_KERNEL_SYMBOLS=no \ + MK_PROFILE=no MK_SENDMAIL=no MK_TESTS=no MK_LIB32=no # Copy distfiles mkdir -p release/usr/freebsd-dist cp *.txz MANIFEST release/usr/freebsd-dist @@ -175,12 +175,12 @@ bootonly: packagesystem # Install system mkdir -p bootonly cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/bootonly WITHOUT_AMD=1 WITHOUT_AT=1 \ - 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_KERNEL_SYMBOLS=1 MK_TESTS=no + DESTDIR=${.OBJDIR}/bootonly MK_AMD=no MK_AT=no \ + MK_GAMES=no MK_GROFF=no \ + MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \ + MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \ + MK_INSTALLIB=no MK_RESCUE=no MK_DICT=no \ + MK_KERNEL_SYMBOLS=no MK_TESTS=no # Copy manifest only (no distfiles) to get checksums mkdir -p bootonly/usr/freebsd-dist cp MANIFEST bootonly/usr/freebsd-dist @@ -199,7 +199,7 @@ dvd: # Install system mkdir -p ${.TARGET} cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ - DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ + DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \ MK_TESTS=no # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist |
