PERFORCE change 124058 for review

[Andrew Pantyukhin]

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

Change 124058 by sat at sat_amilo on 2007/07/24 21:33:52

	The previous commit was actually a work-in-progress with
	some mounting code. This one brings a couple of tweaks.

Affected files ...

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

Differences ...

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

@@ -61,8 +61,10 @@
 
 # Processing DESTDIR_MOUNT_LIST into something more machine-readable
 # VAR:HOST_PATH:DEST_PATH
-# If HOST_PATH is not a dir
-DESTDIR_MOUNT_LIST?=	PORTSDIR WRKDIR:/123 WRKSRC:/567:/789 ABC
+# VAR -> VAR:${VAR}:TMP
+# VAR:HOST_PATH -> VAR:HOST_PATH:TMP
+DESTDIR_MOUNT_LIST?=	
+#DESTDIR_MOUNT_LIST?=	PORTSDIR WRKDIR:/123 WRKSRC:/567:/789 ABC
 _DESTDIR_MOUNT_LIST=
 .for _entry in ${DESTDIR_MOUNT_LIST}
 __entry=${_entry}
@@ -120,6 +122,7 @@
 		_full_dest_path=`realpath $${_destdir}/$${_dest_path}`; \
 		_mounted_entries_list=""; \
 		_created_mountpoints_list=""; \
+		_var_path_list=""; \
 		_entry_was_created=0; \
 		_entry_should_mount=0; \
 		echo "$${_mount_var}:$${_host_path}:$${_full_dest_path}"; \
@@ -139,6 +142,7 @@
 			echo "Checking if already mounted"; \
 			if ${MOUNT}|grep -qs "^$${_host_path} on $${_full_dest_path} ("; then \
 				echo "$${_host_path} is already mounted on $${_full_dest_path}"; \
+				_var_path_list="$${_var_path_list} $${_mount_var}=$${_dest_path}"; \
 			else \
 				echo "$${_host_path} is not mounted on $${_full_dest_path}"; \
 				_entry_should_mount=1; \
@@ -166,6 +170,7 @@
 	echo "$${_destdir_env}"; \
 	${ECHO_CMD} "Things we mounted: $${_mounted_entries_list};" \
 	${ECHO_CMD} "Things we created: $${_created_mountpoints_list};" \
+	${ECHO_CMD} "_var_path_list: $${_var_path_list};" \
 	${ECHO_CMD} "===>  Starting chrooted make in ${DESTDIR}..."; \
 	${CHROOT} $${_destdir} ${SH} -c "(cd $${_builddir}; \
 		${SETENV} -i ${DESTDIR_ENV} $${_destdir_env} ${MAKE} ${.TARGETS})"; \