Date: Mon, 8 Feb 2016 16:08:13 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r295396 - projects/release-pkg Message-ID: <201602081608.u18G8DIP044254@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Mon Feb 8 16:08:13 2016 New Revision: 295396 URL: https://svnweb.freebsd.org/changeset/base/295396 Log: Split the packages target into stage-packages and create-packages to make it possible to roll new packages from an existing build without having to restage them. Modified: projects/release-pkg/Makefile projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile ============================================================================== --- projects/release-pkg/Makefile Mon Feb 8 14:27:45 2016 (r295395) +++ projects/release-pkg/Makefile Mon Feb 8 16:08:13 2016 (r295396) @@ -126,8 +126,9 @@ TGTS= all all-man buildenv buildenvvars _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ - xdev-links native-xtools create-kernel-packages stageworld stagekernel \ - create-world-packages packages installconfig signpackages + xdev-links native-xtools stageworld stagekernel stage-packages \ + create-world-packages create-kernel-packages create-packages \ + packages installconfig signpackages TGTS+= ${SUBDIR_TARGETS} Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Mon Feb 8 14:27:45 2016 (r295395) +++ projects/release-pkg/Makefile.inc1 Mon Feb 8 16:08:13 2016 (r295396) @@ -1374,11 +1374,17 @@ _pkgbootstrap: @env ASSUME_ALWAYS_YES=YES pkg bootstrap .endif -packages: _pkgbootstrap - @mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} ${REPODIR} +packages: stage-packages create-packages + +stage-packages: + @mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} -DNO_ROOT -B stageworld ; \ - ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel ; \ + ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel + +create-packages: _pkgbootstrap + @mkdir -p ${REPODIR} + ${_+_}@cd ${.CURDIR}; \ ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} \ PKG_VERSION=${PKG_VERSION} create-world-packages ; \ ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602081608.u18G8DIP044254>