Date: Thu, 6 Jul 2017 17:59:46 +0000 From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r320748 - head/release Message-ID: <20170706175946.GK76445@FreeBSD.org> In-Reply-To: <201707061754.v66Hs4kL025965@repo.freebsd.org> References: <201707061754.v66Hs4kL025965@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--/jkxxxtAhYIHVDuh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 06, 2017 at 05:54:04PM +0000, Glen Barber wrote: > Author: gjb > Date: Thu Jul 6 17:54:03 2017 > New Revision: 320748 > URL: https://svnweb.freebsd.org/changeset/base/320748 >=20 > Log: > Allow passing NOPKG=3D to make(1) to prevent the pkg-stage target > from getting executed. > =20 > MFC after: 3 days > Sponsored by: The FreeBSD Foundation >=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 Thu Jul 6 17:34:53 2017 (r320747) > +++ head/release/Makefile Thu Jul 6 17:54:03 2017 (r320748) > @@ -269,7 +269,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} > touch ${.TARGET} > =20 > pkg-stage: > -.if !defined(NOPKG) > +.if !defined(NOPKG) || empty(NOPKG) > env PORTSDIR=3D${PORTSDIR} REPOS_DIR=3D${.CURDIR}/pkg_repos/ \ > sh ${.CURDIR}/scripts/pkg-stage.sh > mkdir -p ${.OBJDIR}/dvd/packages/repos/ >=20 Err, the commit message is backwards. The intent here is to enable *un*-setting NOPKG when it is defined but empty. Glen --/jkxxxtAhYIHVDuh Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlleepIACgkQAxRYpUeP 4pNXYQ//cdcSgt5hIGIQpBFKj+qlNkeE7gxtVu7sZCxwbGBX2oCJnPNGGYtOS5sp kIfNHuAU21h6wyRfitEA0L/ulwLiNxOq45TDHXn8I7TsG8PPHU4JmddFGnCL3eoZ +nhgjMJuvf0BAePHpQbuL7//7hU1UO8lamRp/xze+yEuo8pWkHun81D1zjYIuYjG 2RUOOz5GNiJjaySEOwDu/oKDvClC4nHoogxEzslljwmN7U01zEQfAhOCekol69b6 +boF7qBVaX7zXxKxPQXMxnqhM+wow39O+GuQ/jI5MBEiajbO9tlV5QIjD/g29a33 4caLl96p2+lkXc8PcETbxv/dvkEUPSTWwuOV72R9CTTL+EsFszEJMkSoAWbAe2HU UktFdzru0Y1zAlecBCTOwyxN9Pn0hjQ7SBJLR57byYGo+1mZmTNlCcouBBZEFMN8 KYI3vqZIF/cRU2Cs5A3rMju4D6Pce+cvxznvs1XCvo1ytsnBI6RlBhFPnUcB2osZ njO/DmusDHrNqnMjwPLTvy3q7Rnay6IYjuaJyJZmLfOruQOb+SBBoeUvD4HcIodu UdzyLmqN00SYRZ5ut5HcqCcbeTHD8g3tE352tCxBP3ZmsS1hL3oGdlSa9SJsqPMV hh+huF1by4cf7/LAv2GdV5WHb75ZYsImoOfRtVhNupkCuhdKPxQ= =VJ9w -----END PGP SIGNATURE----- --/jkxxxtAhYIHVDuh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170706175946.GK76445>