d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split the packages target into stage-packages and create-packages to make

Browse Source 
it possible to roll new packages from an existing build without having to
restage them.
This commit is contained in:
Dag-Erling Smørgrav 2016-02-08 16:08:13 +00:00
parent ca832df486
commit ee1627c4db
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -126,8 +126,9 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \ _build-tools _cross-tools _includes _libraries _depend \
build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
xdev-links native-xtools create-kernel-packages stageworld stagekernel \ xdev-links native-xtools stageworld stagekernel stage-packages \
create-world-packages packages installconfig signpackages create-world-packages create-kernel-packages create-packages \
packages installconfig signpackages
TGTS+= ${SUBDIR_TARGETS} TGTS+= ${SUBDIR_TARGETS}

12
Makefile.inc1
View File

@ -1374,11 +1374,17 @@ _pkgbootstrap:
@env ASSUME_ALWAYS_YES=YES pkg bootstrap @env ASSUME_ALWAYS_YES=YES pkg bootstrap
.endif .endif
packages: _pkgbootstrap packages: stage-packages create-packages
@mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} ${REPODIR}
stage-packages:
@mkdir -p ${WSTAGEDIR} ${KSTAGEDIR}
${_+_}@cd ${.CURDIR}; \ ${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} -DNO_ROOT -B stageworld ; \ ${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}} \ ${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} \
PKG_VERSION=${PKG_VERSION} create-world-packages ; \ PKG_VERSION=${PKG_VERSION} create-world-packages ; \
${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} \ ${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} \