PERFORCE change 123724 for review
Gabor Kovesdan
gabor at FreeBSD.org
Thu Jul 19 11:19:03 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=123724
Change 123724 by gabor at gabor_server on 2007/07/19 11:18:33
Revert to the last functioning state.
Affected files ...
.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#20 edit
Differences ...
==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#20 (text+ko) ====
@@ -45,14 +45,12 @@
DESTDIR_ENV_LIST?=
-DESTDIR_ENV= DESTDIR= CHROOTED=YES
+DESTDIR_ENV= DESTDIR= CHROOTED=YES PORTSDIR=${PORTSDIR_TMP_REL}
-.for _var in ${DESTDIR_ENV_LIST:NDESTDIR:NCHROOTED}
+.for _var in ${DESTDIR_ENV_LIST:NDESTDIR:NCHROOTED:NPORTSDIR}
DESTDIR_ENV+= ${_var}="${${_var}}"
.endfor
-DESTDIR_MOUNT_LIST?= PORTSDIR:${PORTSDIR}
-
.for _target in ${.TARGETS}
${_target}: pre-chroot do-chroot
@${TRUE}
@@ -64,32 +62,14 @@
.endif
.if !target(do-chroot)
+
+PORTSDIR_TMP!= ${MKTEMP} -d ${DESTDIR}/tmp/portsdir.XXXXXX
+PORTSDIR_TMP_REL= ${PORTSDIR_TMP:S,^${DESTDIR},,}
+BUILDDIR= ${.CURDIR:S,^${PORTSDIR},,:S,^,${PORTSDIR_TMP_REL},}
+
do-chroot:
- @for _entry in ${DESTDIR_MOUNT_LIST}; do \
- _var= `${ECHO_CMD} $${_entry} | ${SED} -e 's/:.*//'`; \
- _path1= `${ECHO_CMD} $${_entry} | ${SED} -e 's/[^:]*://'`; \
- _path2= `${ECHO_CMD} $${_path1} | ${SED} -e 's/.*://'`; \
- echo "$${_var} $${_path1} $${_path2}"; \
- if [ $${_path1} = $${_path2} ]; then \
- _tmpdir= `${MKTEMP} -d ${DESTDIR}/tmp/tmpdir.XXXXXX`; \
- _tmpdir_rel= `${ECHO_CMD} $${_tmpdir} | ${SED} -e 's|^${DESTDIR}||'`; \
- if [ $${_var} = PORTSDIR ]; then \
- _builddir= ${ECHO_CMD} ${.CURDIR} | ${SED} -e 's|^${PORTSDIR}||' -e 's|^|$${_tmpdir_rel}|'; \
- fi; \
- _tmp= "$${_destdir_env}"; \
- _destdir_env= "$${_tmp} $${_var}=$${_tmpdir_rel}"; \
- echo "$${_destdir_env}"; \
- ${MOUNT_NULLFS} $${_path1} ${DESTDIR}${_tmpdir_rel}; \
- else \
- if [ $${_var} = PORTSDIR ]; then \
- _builddir= ${ECHO_CMD} ${.CURDIR} | ${SED} -e 's|^${PORTSDIR}||' -e 's|^|$${_tmpdir_rel}|'; \
- fi; \
- _tmp= "$${_destdir_env}"; \
- _destdir_env= "$${_tmp} $${_var}=$${_path2}"; \
- ${MOUNT_NULLFS} $${_path1} ${DESTDIR}/$${_path2}; \
- fi; \
- done; \
- echo "$${_destdir_env}"; \
+ ${ECHO_CMD} "===> Nullmounting ports tree into ${DESTDIR}..."; \
+ ${MOUNT_NULLFS} ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL}; \
found=0; \
for _entry in `${MOUNT} | ${GREP} devfs | ${AWK} {'print $$3'}`; do \
if [ `${REALPATH} $${_entry}` = `${REALPATH} ${DESTDIR}/dev` ]; then \
@@ -101,7 +81,9 @@
${MOUNT_DEVFS} ${DESTDIR}/dev; \
fi; \
${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \
- ${CHROOT} ${DESTDIR} ${SH} -c "(cd $${_builddir}; ${SETENV} -i ${DESTDIR_ENV} $${_destdir_env} ${MAKE} ${.TARGETS})"
+ ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${SETENV} -i ${DESTDIR_ENV} ${MAKE} ${.TARGETS})"; \
+ ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL}; \
+ ${RMDIR} ${DESTDIR}${PORTSDIR_TMP_REL}
.endif
.endif
More information about the p4-projects
mailing list