Commit Graph

5 Commits

Author SHA1 Message Date
Xin LI
a29af14de4 Apply mergemaster r255428:
Pass -n (do not emit comments) when saving mtree information for future
mergemaster(8) runs.

MFC after:	3 days
2016-06-08 06:33:55 +00:00
Simon J. Gerraty
3fc9660791 Ensure TEMPROOT is unique, to guard against multiple builds on same machine.
Differential Revision:	D3002
Reviewed by:	gjb
2015-11-08 23:46:05 +00:00
Gavin Atkinson
ac1b139605 Remove an nunnecessary reference to csup. 2014-06-25 12:17:00 +00:00
Will Andrews
0ca8e70cb0 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.
2013-08-27 04:42:42 +00:00
Doug Barton
c61ff19489 Add a script to create the /var/db/mergemaster.mtree file for new
releases so that when users subsequently update their source trees
they can make use of mergemaster's -U option.
2009-08-23 05:42:50 +00:00