d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 'make installcheck' to check for missing UID/GID as well, broken

Browse Source 
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)
This commit is contained in:
Bryan Drewery 2013-09-18 00:33:24 +00:00
parent 7995e29931
commit 31caf4c87b
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.inc1
View File

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