aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2013-08-27 04:42:42 +0000
committerWill Andrews <will@FreeBSD.org>2013-08-27 04:42:42 +0000
commit0ca8e70cb0c048a1f239195d4980a58f3da9c533 (patch)
tree18139bc93ca1453ad4073ab3f97d600817100787 /release/scripts
parent3c9657753edbbb3d2ffb845e9171756272c722db (diff)
downloadsrc-0ca8e70cb0c048a1f239195d4980a58f3da9c533.tar.gz
src-0ca8e70cb0c048a1f239195d4980a58f3da9c533.zip
Fix 'make release' on older hosts: use buildworld legacy utilities.
Newer FreeBSD installs require an install(1) that supports the new flags. This adds ${MAKEOBJDIRPREFIX}${.CURDIR}/tmp/legacy/{bin,usr/{bin,sbin}} to the PATH while generating an mtree database for 'make release'. Note that the problem only exists here because mm-mtree.sh generates its own object tree to avoid mucking with the existing one, which results in a PATH containing legacy utility dirs that are empty.
Notes
Notes: svn path=/head/; revision=254951
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/mm-mtree.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/release/scripts/mm-mtree.sh b/release/scripts/mm-mtree.sh
index d132a34a0e7e..644f309f3c09 100755
--- a/release/scripts/mm-mtree.sh
+++ b/release/scripts/mm-mtree.sh
@@ -81,6 +81,11 @@ if [ ! -f ${SOURCEDIR}/Makefile.inc1 -a \
fi
# Setup make to use system files from SOURCEDIR
+objp=${MAKEOBJDIRPREFIX}
+[ -z "${objp}" ] && objp=/usr/obj
+legacydir=${objp}${SOURCEDIR}/tmp/legacy
+legacypath=${legacydir}/usr/sbin:${legacydir}/usr/bin:${legacydir}/bin
+MM_MAKE_ARGS="${MM_MAKE_ARGS} PATH=${legacypath}:${PATH}"
MM_MAKE="make ${ARCHSTRING} ${MM_MAKE_ARGS} -m ${SOURCEDIR}/share/mk"
delete_temproot () {