From owner-svn-src-all@FreeBSD.ORG Sat Jun 14 01:03:24 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBC28D99; Sat, 14 Jun 2014 01:03:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A12E62943; Sat, 14 Jun 2014 01:03:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5E13O9f034359; Sat, 14 Jun 2014 01:03:24 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5E13OAE034358; Sat, 14 Jun 2014 01:03:24 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201406140103.s5E13OAE034358@svn.freebsd.org> From: Glen Barber Date: Sat, 14 Jun 2014 01:03:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267459 - head/release X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jun 2014 01:03:24 -0000 Author: gjb Date: Sat Jun 14 01:03:24 2014 New Revision: 267459 URL: http://svnweb.freebsd.org/changeset/base/267459 Log: 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 Modified: head/release/Makefile Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Sat Jun 14 00:54:57 2014 (r267458) +++ head/release/Makefile Sat Jun 14 01:03:24 2014 (r267459) @@ -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