From d182352391ba0f4301781c5e1c98a8e31a9b8315 Mon Sep 17 00:00:00 2001
From: royger <royger@FreeBSD.org>
Date: Wed, 8 Aug 2018 07:58:29 +0000
Subject: [PATCH] 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
---
 Makefile.inc1 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f724337a0a01..42d1dccb7c16 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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