Attachment #197388 for bug #231334

View | Details | Raw Unified | Return to bug 231334
Collapse All | Expand All




DB_FROM_SRC=	yes
.endif

.if defined(DB_FROM_SRC) || defined(DESTDIR)
INSTALLFLAGS+=	-N ${.CURDIR}/etc
MTREEFLAGS+=	-N ${.CURDIR}/etc
.endif

.if defined(BUILD_PKGS)
INSTALLFLAGS+=	-h sha256
.endif
.if defined(DB_FROM_SRC) || defined(NO_ROOT) || defined(DESTDIR)
IMAKE_INSTALL=	INSTALL="install ${INSTALLFLAGS}"
IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLAGS}"
.endif

_installcheck_world: __installcheck_UGID
__installcheck_UGID: .PHONY
.for uid in ${CHECK_UIDS}
	@if ! `grep "^${uid}:" ${DESTDIR}/etc/passwd > /dev/null 2>&1`; then \
		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
		false; \
	fi
.endfor
.for gid in ${CHECK_GIDS}
	@if ! `grep "^${gid}:" ${DESTDIR}/etc/group > /dev/null 2>&1`; then \
		echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \
		false; \
	fi

Return to bug 231334

Lines 837-843 Link Here

(-)Makefile.inc1 (-4 / +4 lines)
837	DB_FROM_SRC= yes	837	DB_FROM_SRC= yes
838	.endif	838	.endif
839		839
840	.if defined(DB_FROM_SRC)	840	.if defined(DB_FROM_SRC) \|\| defined(DESTDIR)
841	INSTALLFLAGS+= -N ${.CURDIR}/etc	841	INSTALLFLAGS+= -N ${.CURDIR}/etc
842	MTREEFLAGS+= -N ${.CURDIR}/etc	842	MTREEFLAGS+= -N ${.CURDIR}/etc
843	.endif	843	.endif
Lines 853-859 Link Here
853	.if defined(BUILD_PKGS)	853	.if defined(BUILD_PKGS)
854	INSTALLFLAGS+= -h sha256	854	INSTALLFLAGS+= -h sha256
855	.endif	855	.endif
856	.if defined(DB_FROM_SRC) \|\| defined(NO_ROOT)	856	.if defined(DB_FROM_SRC) \|\| defined(NO_ROOT) \|\| defined(DESTDIR)
857	IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}"	857	IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}"
858	IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}"	858	IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}"
859	.endif	859	.endif
Lines 1187-1199 Link Here
1187	_installcheck_world: __installcheck_UGID	1187	_installcheck_world: __installcheck_UGID
1188	__installcheck_UGID: .PHONY	1188	__installcheck_UGID: .PHONY
1189	.for uid in ${CHECK_UIDS}	1189	.for uid in ${CHECK_UIDS}
1190	@if ! `id -u ${uid} >/dev/null 2>&1`; then \	1190	@if ! `grep "^${uid}:" ${DESTDIR}/etc/passwd > /dev/null 2>&1`; then \
1191	echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \	1191	echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
1192	false; \	1192	false; \
1193	fi	1193	fi
1194	.endfor	1194	.endfor
1195	.for gid in ${CHECK_GIDS}	1195	.for gid in ${CHECK_GIDS}
1196	@if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \	1196	@if ! `grep "^${gid}:" ${DESTDIR}/etc/group > /dev/null 2>&1`; then \
1197	echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \	1197	echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \
1198	false; \	1198	false; \
1199	fi	1199	fi