Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Jun 2014 10:34:50 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Nathan Whitehorn <nwhitehorn@freebsd.org>
Cc:        svn-src-head@freebsd.org, svn-src-all@freebsd.org, Julio Merino <jmmv@freebsd.org>, src-committers@freebsd.org
Subject:   Re: svn commit: r267332 - head/release
Message-ID:  <D82BB88B-DE3E-4DE0-9935-C2ABDA382784@gmail.com>
In-Reply-To: <53973EC7.10306@freebsd.org>
References:  <201406101705.s5AH5gt8007603@svn.freebsd.org> <53973EC7.10306@freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help


On Jun 10, 2014, at 11:22 AM, Nathan Whitehorn <nwhitehorn@freebsd.org> wrote:

> On 06/10/14 10:05, Julio Merino wrote:
>> Author: jmmv
>> Date: Tue Jun 10 17:05:41 2014
>> New Revision: 267332
>> URL: http://svnweb.freebsd.org/changeset/base/267332
>> 
>> Log:
>>   Strip out the test suite from the installation media.
>>      This affects the disc1.iso, dvd1.iso and bootonly.iso files.
>>      Obtained from:	gjb
>> 
>> Modified:
>>   head/release/Makefile
>> 
>> Modified: head/release/Makefile
>> ==============================================================================
>> --- head/release/Makefile	Tue Jun 10 17:04:30 2014	(r267331)
>> +++ head/release/Makefile	Tue Jun 10 17:05:41 2014	(r267332)
>> @@ -155,7 +155,7 @@ system: packagesystem
>>  	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 WITHOUT_ATF=1 WITHOUT_LIB32=1
>> +		WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1
>>  # Copy distfiles
> 
> Shouldn't this be "WITHOUT_TESTS" or the like? I thought we weren't supposed to set MK_* at the command line.

We recently started allowing MK_TESTS=no on the command line. In general, all of those WITHOUT_xxx should become MK_xxx=no in release/Makefile. Having the MK_xxxx version isolates us further from (a) the current defaults and (b) config files that turn it to the other direction.

Warner




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D82BB88B-DE3E-4DE0-9935-C2ABDA382784>