PERFORCE change 122328 for review

[Gabor Kovesdan]

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

Change 122328 by gabor at 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}