From owner-svn-src-head@FreeBSD.ORG  Wed Sep 18 00:33:25 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTP id C4E67B23;
 Wed, 18 Sep 2013 00:33:25 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 98E28207B;
 Wed, 18 Sep 2013 00:33:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8I0XPXt001565;
 Wed, 18 Sep 2013 00:33:25 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8I0XPcx001564;
 Wed, 18 Sep 2013 00:33:25 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201309180033.r8I0XPcx001564@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 18 Sep 2013 00:33:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255660 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Sep 2013 00:33:25 -0000

Author: bdrewery (ports committer)
Date: Wed Sep 18 00:33:24 2013
New Revision: 255660
URL: http://svnweb.freebsd.org/changeset/base/255660

Log:
  Fix 'make installcheck' to check for missing UID/GID as well, broken
  since r249893, by adding a separate _installcheck_world and
  _installcheck_kernel so the destination targets can be more explicit
  on which they are needed for.
  
  installcheck will call both, while installworld only calls
  _installcheck_world and installkernel only calls _installcheck_kernel
  
  While here, mark the internal targets as starting with _.
  
  Reported by:	des
  Reviewed by:	des
  Pointyhat to:	bdrewery
  Approved by:	re (delphij)

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Sep 17 22:26:07 2013	(r255659)
+++ head/Makefile.inc1	Wed Sep 18 00:33:24 2013	(r255660)
@@ -676,8 +676,9 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc
 #
 # Checks to be sure system is ready for installworld/installkernel.
 #
-installcheck:
-installcheck_UGID:
+installcheck: _installcheck_world _installcheck_kernel
+_installcheck_world:
+_installcheck_kernel:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
@@ -686,8 +687,9 @@ installcheck_UGID:
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
     defined(DB_FROM_SRC)
 .if !make(distributeworld)
-installcheck: installcheck_DESTDIR
-installcheck_DESTDIR:
+_installcheck_world: __installcheck_DESTDIR
+_installcheck_kernel: __installcheck_DESTDIR
+__installcheck_DESTDIR:
 .if !defined(DESTDIR) || empty(DESTDIR)
 	@echo "ERROR: Please set DESTDIR!"; \
 	false
@@ -713,7 +715,8 @@ CHECK_GIDS+=	proxy authpf
 CHECK_UIDS+=	unbound
 CHECK_GIDS+=	unbound
 .endif
-installcheck_UGID:
+_installcheck_world: __installcheck_UGID
+__installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
@@ -768,7 +771,7 @@ EXTRA_DISTRIBUTIONS+=	lib32
 
 MTREE_MAGIC?=	mtree 2.0
 
-distributeworld installworld: installcheck installcheck_UGID
+distributeworld installworld: _installcheck_world
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
@@ -1046,7 +1049,7 @@ buildkernel:
 # Install the kernel defined by INSTALLKERNEL
 #
 installkernel installkernel.debug \
-reinstallkernel reinstallkernel.debug: installcheck
+reinstallkernel reinstallkernel.debug: _installcheck_kernel
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false