The side effect of revision 1.687 (env -i) was that many useful knobs

are no longer propagated to the chrooted environment, e.g. NOKERBEROS.
On the other hand, TMPDIR and MAKEOBJDIRPREFIX should no longer be.

Spotted by:	Alexandr Listopad <laa@reis.zp.ua>
This commit is contained in:
ru 2002-08-05 16:46:14 +00:00
parent 24b8f9fd0d
commit 482630519d

View File

@ -396,12 +396,22 @@ rerelease release:
.endif
.if defined(TARGET_ARCH)
echo "export TARGET_ARCH=\"${TARGET_ARCH}\"" >> ${CHROOTDIR}/mk
.endif
.if defined(EXTRA_SRC)
echo "export EXTRA_SRC=\"${EXTRA_SRC}\"" >> ${CHROOTDIR}/mk
.endif
.if defined(FIXCRYPTO)
echo "export FIXCRYPTO=\"${FIXCRYPTO}\"" >> ${CHROOTDIR}/mk
.endif
.if defined(NOKERBEROS)
echo "export NOKERBEROS=\"${NOKERBEROS}\"" >> ${CHROOTDIR}/mk
.endif
.if defined(NO_SENDMAIL)
echo "export NO_SENDMAIL=\"${NO_SENDMAIL}\"" >> ${CHROOTDIR}/mk
.endif
# Don't remove this, or the build will fall over!
echo "export RELEASEDIR=${_R}" >> ${CHROOTDIR}/mk
echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${CHROOTDIR}/mk
echo "export TMPDIR=/tmp" >> ${CHROOTDIR}/mk
echo "export MAKEOBJDIRPREFIX=/usr/obj" >> ${CHROOTDIR}/mk
echo "export MANBUILDCAT=YES" >> ${CHROOTDIR}/mk
echo "if [ ! -f /tmp/.world_done ]; then" >> ${CHROOTDIR}/mk
echo " cd /usr/src" >> ${CHROOTDIR}/mk