Date: Fri, 23 Jan 2015 22:23:57 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Ian Lepore <ian@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Colin Percival <cperciva@FreeBSD.org> Subject: Re: svn commit: r277606 - head/release Message-ID: <20150123222357.GD1264@hub.FreeBSD.org> In-Reply-To: <1422044932.1038.3.camel@freebsd.org> References: <201501232024.t0NKODZq079972@svn.freebsd.org> <1422044932.1038.3.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--TybLhxa8M7aNoW+V Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > >=20 > > 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. > > =20 > > Approved by: gjb > >=20 > > Modified: > > head/release/Makefile > >=20 > > Modified: head/release/Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- 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 > > =20 > > release: real-release vm-release cloudware-release > > + @true > > =20 > > real-release: > > ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj > >=20 >=20 > Wouldn't '.PHONY: release' be a better/more-correct fix? >=20 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 --TybLhxa8M7aNoW+V Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUwsn9AAoJEAMUWKVHj+KTQDQQAIN1msJZZ2QNHk6G1bIYHJX1 VcnTy3vvHjNnD/Zu9DhCpnenc0Uy5laFH/04ncXAkaAtdmZh9TycKttS/JMihgr1 s5XpjnyWOxhtkatvarI7EyBHC/frEVMv1B/iQQmi1CGwKpbMIctIzsk7DB5nOMRP 3kUFT6/dFPkhCcFnI0d9zIp+SbQDEfPkAQyqEd9cWvfWHkKJPNs2dzruSnZfVuef nWShXga0BG+ilB2ZFQQNC5kh0PQowHoIcYz0F2Lm6EL8xz45t9s23iY3oQe76VW4 pj8ctBuzbwC2p6fPaHV9me098bAnRoNXZrYwiz2sD+vNXOP0LpLNdY0aHNYlDcQ4 eWGO5EEaw3uE/veZNcv7JH9bLZ4lqtq778JNvn83IJ2DkrFVLZYKpcBg6ql7nyWJ quFZK2iXmIbbxk1sX53xYnQqmk2lgTPlUHK+aQ1ixR+AMqElWIk9P29tLbujphWT EYF/KSgr+KnyqzwchJGjZOVplIlN9SQ5jbA4FfuZc/kfCXEvSpGMEjcpFH3pqsSo zsWCtkRNVTX+wSNn/KJsZ/QlYlK20KPNnx6Mvqv9CjS2cHAbhwfYxTIpkKQTZWOX 8OVj45hdd/OIebrqTCtj0qSoMKmbn1N7BKI1MLz/hH0ynNv83zsDEE3VDmeRYdUv vgwPFvC1WWlW9Pi/ScXB =oBur -----END PGP SIGNATURE----- --TybLhxa8M7aNoW+V--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150123222357.GD1264>