svn commit: r258848 - user/hrs/releng/release

[John Baldwin]

On Monday, December 02, 2013 9:51:03 am Glen Barber wrote:
> On Mon, Dec 02, 2013 at 02:40:26PM +0000, Hiroki Sato wrote:
> > Author: hrs
> > Date: Mon Dec  2 14:40:26 2013
> > New Revision: 258848
> > URL: http://svnweb.freebsd.org/changeset/base/258848
> > 
> > Log:
> >   Improve robustness and consistency, and remove redundant lines with no
> >   major functional change:
> 
> > [...]
> 
> > +if [ $($ID -u) -ne 0 ]; then
> > +	echo 1>&2 "$0: Needs to be run as root."
> > +	exit 1
> > +fi
> >  # The directory within which the release will be built.
> > -CHROOTDIR="/scratch"
> > +: ${CHROOTDIR:=/scratch}
> > +: ${CHROOT_CMD:=chroot $CHROOTDIR}
> > +: ${DESTDIR=:/R/}
> > +: ${MAKEOBJDIRPREFIX:=/usr/obj}
> >  
> 
> Please do not merge these changes to head/.  It was intentional that
> environment was not honored, as everything should be set in the
> configuration file.
> 
> It is possible to use the environment in the configuration file, such
> as:
> 
> ---- release.conf ----
> : ${_DESTDIR=:/R/}
> DESTDIR=${_DESTDIR}
> ---- release.conf ----

OTOH, I have hacked release.sh at my work specifically in this manner
since I use a wrapper script to invoke release.sh and don't want to have
to create a temporary file, etc.  I tried using this approach for
release.conf when you suggested and it did not work IIRC.

-- 
John Baldwin