svn commit: r337452 - head

[Roger Pau Monné]

Author: royger
Date: Wed Aug  8 07:58:29 2018
New Revision: 337452
URL: https://svnweb.freebsd.org/changeset/base/337452

Log:
  build: skip the database check for the distributeworld target
  
  distributeworld is used to generate install media, so it makes no
  sense to check the host database since the install media can be
  generated from any box, regardless of the version of FreeBSD it's
  running.
  
  Sponsored by:		Citrix Systems R&D
  Reviewed by:		ian, gjb
  Differential revision:	https://reviews.freebsd.org/D16507

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Aug  8 07:32:14 2018	(r337451)
+++ head/Makefile.inc1	Wed Aug  8 07:58:29 2018	(r337452)
@@ -830,6 +830,13 @@ IMAKE+=		__MAKE_SHELL=${INSTALLTMP}/sh
 .else
 IMAKEENV+=	PATH=${TMPPATH}:${INSTALLTMP}
 .endif
+
+# When generating install media, do not allow user and group information from
+# the build host to affect the contents of the distribution.
+.if make(distributeworld)
+DB_FROM_SRC=	yes
+.endif
+
 .if defined(DB_FROM_SRC)
 INSTALLFLAGS+=	-N ${.CURDIR}/etc
 MTREEFLAGS+=	-N ${.CURDIR}/etc