Re: svn commit: r267332 - head/release

2014-06-13 Thread Warner Losh 

On Jun 10, 2014, at 11:22 AM, Nathan Whitehorn nwhiteh...@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/MakefileTue Jun 10 17:04:30 2014(r267331)
 +++ head/release/MakefileTue 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_ version isolates us further from (a) the current defaults and (b) 
config files that turn it to the other direction.

Warner

___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r267332 - head/release

2014-06-13 Thread Glen Barber 
On Fri, Jun 13, 2014 at 10:34:50AM -0600, Warner Losh wrote:
 
 On Jun 10, 2014, at 11:22 AM, Nathan Whitehorn nwhiteh...@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_ version isolates us further from (a) the current defaults and (b) 
 config files that turn it to the other direction.
 

The WITH*_FOO - MK_FOO change is on my TODO this weekend.  I want to
run at least one full build before committing it.

Glen



pgpwSXJMFCglD.pgp
Description: PGP signature

Re: svn commit: r267332 - head/release

2014-06-13 Thread Warner Losh 

On Jun 13, 2014, at 10:49 AM, Glen Barber g...@freebsd.org wrote:

 On Fri, Jun 13, 2014 at 10:34:50AM -0600, Warner Losh wrote:
 
 On Jun 10, 2014, at 11:22 AM, Nathan Whitehorn nwhiteh...@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_ version isolates us further from (a) the current defaults and 
 (b) config files that turn it to the other direction.
 
 
 The WITH*_FOO - MK_FOO change is on my TODO this weekend.  I want to
 run at least one full build before committing it.

There’s no rush. What’s there now works, except in extreme circumstances. 
Testing of this stuff is good. It is way too easy to think a change is a NOP 
when in fact it breaks something subtle...

Warner


signature.asc
Description: Message signed with OpenPGP using GPGMail

svn commit: r267332 - head/release

2014-06-10 Thread Julio Merino 
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
mkdir -p release/usr/freebsd-dist
cp *.txz MANIFEST release/usr/freebsd-dist
@@ -180,7 +180,7 @@ bootonly: packagesystem
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
+   WITHOUT_KERNEL_SYMBOLS=1 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,8 @@ 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} WITHOUT_RESCUE=1 
WITHOUT_KERNEL_SYMBOLS=1 \
+   MK_TESTS=no
 # Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
cp *.txz MANIFEST ${.TARGET}/usr/freebsd-dist
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r267332 - head/release

2014-06-10 Thread Nathan Whitehorn 

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.

-Nathan
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org

Re: svn commit: r267332 - head/release

2014-06-10 Thread Glen Barber 
On Tue, Jun 10, 2014 at 10:22:15AM -0700, Nathan Whitehorn 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/MakefileTue Jun 10 17:04:30 2014(r267331)
 +++ head/release/MakefileTue 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.

It does not work, or at least last I tried, because you cannot specify
WITHOUT_FOO=1 if WITH_FOO=1 is set.  Using MK_FOO=no allows more
granular tuning for these cases.

Glen



pgpmhE7xgH6_L.pgp
Description: PGP signature

Re: svn commit: r267332 - head/release

2014-06-10 Thread Nathan Whitehorn 

On 06/10/14 10:26, Glen Barber wrote:

On Tue, Jun 10, 2014 at 10:22:15AM -0700, Nathan Whitehorn 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.

It does not work, or at least last I tried, because you cannot specify
WITHOUT_FOO=1 if WITH_FOO=1 is set.  Using MK_FOO=no allows more
granular tuning for these cases.

Glen



Ah, OK. Just wanted to make sure it was deliberate!
-Nathan
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org