Author: bdrewery (ports committer)
Date: Fri May 10 13:09:44 2013
New Revision: 250452
URL: http://svnweb.freebsd.org/changeset/base/250452
Log:
MFC r249807,249893
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
Modified:
stable/9/Makefile.inc1 (contents, props changed)
Directory Properties:
stable/9/ (props changed)
Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1 Fri May 10 12:49:16 2013 (r250451)
+++ stable/9/Makefile.inc1 Fri May 10 13:09:44 2013 (r250452)
@@ -600,6 +600,7 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc
# Checks to be sure system is ready for installworld/installkernel.
#
installcheck:
+installcheck_UGID:
#
# Require DESTDIR to be set if installing for a different architecture or
@@ -631,7 +632,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 \
@@ -685,7 +685,7 @@ EXTRA_DISTRIBUTIONS+= games
EXTRA_DISTRIBUTIONS+= lib32
.endif
-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"
