From owner-p4-projects@FreeBSD.ORG  Tue Jun 26 07:25:00 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 004DE16A469; Tue, 26 Jun 2007 07:24:59 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CE3A416A400
	for <perforce@freebsd.org>; Tue, 26 Jun 2007 07:24:56 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id BE5E113C483
	for <perforce@freebsd.org>; Tue, 26 Jun 2007 07:24:56 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q7OuKM094967
	for <perforce@freebsd.org>; Tue, 26 Jun 2007 07:24:56 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q7OuhW094964
	for perforce@freebsd.org; Tue, 26 Jun 2007 07:24:56 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 26 Jun 2007 07:24:56 GMT
Message-Id: <200706260724.l5Q7OuhW094964@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122328 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jun 2007 07:25:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=122328

Change 122328 by gabor@gabor_server on 2007/06/26 07:24:39

	- Use more proper checking for devfs mount, the previous version was
	  weird and did not work well at all

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#5 edit

Differences ...

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#5 (text+ko) ====

@@ -43,11 +43,17 @@
 
 do-chroot:
 	${ECHO_CMD} "===> Nullmounting ports tree into ${DESTDIR}..."; \
-	${MOUNT_NULLFS} ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL}
-.if !exists (${DESTDIR}/dev/null)
-	${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \
-	${MOUNT_DEVFS} ${DESTDIR}/dev
-.endif
+	${MOUNT_NULLFS} ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL}; \
+	found=0; \
+	for _entry in `${MOUNT} | ${GREP} devfs | ${AWK} {'print $$3'}`; do \
+		if [ $${_entry} = ${DESTDIR}/dev ]; then \
+			found=1; \
+		fi; \
+	done; \
+	if [ $${found} = 0 ]; then \
+		${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \
+		${MOUNT_DEVFS} ${DESTDIR}/dev; \
+	fi; \
 	${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \
 	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})"; \
 	${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL}