Author: bdrewery (ports committer)
Date: Tue Apr 23 13:07:58 2013
New Revision: 249807
URL: http://svnweb.freebsd.org/changeset/base/249807

Log:
  Fix installkernel requiring users/groups defined in CHECK_UIDS
  and CHECK_GIDS to exist since r152680. This is only needed for
  installworld. The documented procedure of running mergemaster -p
  to check for missing users is only needed for installworld, not
  for installkernel. This fixes auditdistd incorrectly being
  required for installkernel.
  
  PR:           misc/174405
  Approved by:  bapt

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1  Tue Apr 23 13:03:17 2013        (r249806)
+++ head/Makefile.inc1  Tue Apr 23 13:07:58 2013        (r249807)
@@ -647,7 +647,6 @@ CHECK_GIDS+=        smmsp
 CHECK_UIDS+=   proxy
 CHECK_GIDS+=   proxy authpf
 .endif
-installcheck: installcheck_UGID
 installcheck_UGID:
 .for uid in ${CHECK_UIDS}
        @if ! `id -u ${uid} >/dev/null 2>&1`; then \
@@ -703,7 +702,7 @@ EXTRA_DISTRIBUTIONS+=       lib32
 
 MTREE_MAGIC?=  mtree 2.0
 
-distributeworld installworld: installcheck
+distributeworld installworld: installcheck installcheck_UGID
        mkdir -p ${INSTALLTMP}
        progs=$$(for prog in ${ITOOLS}; do \
                if progpath=`which $$prog`; then \
_______________________________________________
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"

Reply via email to