svn commit: r277606 - head/release

[Glen Barber]

On Fri, Jan 23, 2015 at 01:28:52PM -0700, Ian Lepore wrote:
> On Fri, 2015-01-23 at 20:24 +0000, Colin Percival wrote:
> > Author: cperciva
> > Date: Fri Jan 23 20:24:13 2015
> > New Revision: 277606
> > URL: https://svnweb.freebsd.org/changeset/base/277606
> > 
> > Log:
> >   Provide a recipe of "true" for building the "release" target once its
> >   prerequisites are satisfied, in order to avoid having an implicit rule
> >   triggered by the presence of release.sh.
> >   
> >   Approved by:	gjb
> > 
> > Modified:
> >   head/release/Makefile
> > 
> > Modified: head/release/Makefile
> > ==============================================================================
> > --- head/release/Makefile	Fri Jan 23 19:43:57 2015	(r277605)
> > +++ head/release/Makefile	Fri Jan 23 20:24:13 2015	(r277606)
> > @@ -279,6 +279,7 @@ ftp: packagesystem
> >  	cp *.txz MANIFEST ftp
> >  
> >  release:	real-release vm-release cloudware-release
> > +	@true
> >  
> >  real-release:
> >  	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
> > 
> 
> Wouldn't '.PHONY: release' be a better/more-correct fix?
> 

I'm not sure this is a more proper fix in how this Makefile is set up
currently.

Prior to my recent changes, 'release' invoked each RELEASE_TARGETS entry
individually, which in turn invoke 'system' and 'packagesystem', if
needed.

The disc1.iso target uses the literal 'release' directory to populate
the CDROM image, which after success, 'make release' will not do
anything because the 'release' target is up-to-date.  This is the
intended behavior, which with Colin's '@true' addition, keeps the
behavior consistent with what previously happened.

I do want to change where the disc1.iso bits get installed, after which
adding 'touch ${.TARGET}' to the release target should continue to do
the right thing.

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20150123/412ca18e/attachment.sig>