diff options
| author | des <des@FreeBSD.org> | 2016-02-08 16:08:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-02-08 16:08:13 +0000 |
| commit | 234fc137b1865aa62fef7ab1a95c628ab2fec6ff (patch) | |
| tree | 80ef38beec6596444fca2f636231d37918073aee | |
| parent | 7abbb2ca7f8618b566ad2a72406ea8d0bc52f8d7 (diff) | |
| download | FreeBSD-src-234fc137b1865aa62fef7ab1a95c628ab2fec6ff.zip FreeBSD-src-234fc137b1865aa62fef7ab1a95c628ab2fec6ff.tar.gz | |
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.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | Makefile.inc1 | 12 |
2 files changed, 12 insertions, 5 deletions
@@ -126,8 +126,9 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ _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} diff --git a/Makefile.inc1 b/Makefile.inc1 index 99f9798..40285dd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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}} \ |
