Date: Fri, 7 Jul 2017 15:00:25 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320778 - releng/11.1/release Message-ID: <201707071500.v67F0PEp053333@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Jul 7 15:00:25 2017 New Revision: 320778 URL: https://svnweb.freebsd.org/changeset/base/320778 Log: MFS11 r320753: MFC r320748: Allow passing NOPKG= to make(1) to enable the pkg-stage target from getting executed when NOPKG is defined but empty. Approved by: re (kib) Sponsored by: The FreeBSD Foundation Modified: releng/11.1/release/Makefile Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/release/Makefile ============================================================================== --- releng/11.1/release/Makefile Fri Jul 7 13:55:11 2017 (r320777) +++ releng/11.1/release/Makefile Fri Jul 7 15:00:25 2017 (r320778) @@ -265,7 +265,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} touch ${.TARGET} pkg-stage: -.if !defined(NOPKG) +.if !defined(NOPKG) || empty(NOPKG) env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \ sh ${.CURDIR}/scripts/pkg-stage.sh mkdir -p ${.OBJDIR}/dvd/packages/repos/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707071500.v67F0PEp053333>