Create a "packages" target takes care of all the magic

This commit is contained in:
Baptiste Daroussin 2015-03-15 14:05:55 +00:00
parent 084e5741bd
commit 42450b4928
2 changed files with 11 additions and 5 deletions

View File

@ -113,7 +113,8 @@ 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 kernel-pkgs stageworld create-world-packages
xdev-links native-xtools kernel-pkgs stageworld create-world-packages \
packages
TGTS+= ${SUBDIR_TARGETS}

View File

@ -1209,10 +1209,6 @@ packagekernel:
.endif
create-world-packages:
.if !defined(NO_ROOT)
@echo "ERROR: create-world-package can only be done with -DNO_ROOT"; \
false
.endif
@cd ${DESTDIR} ; \
awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
${DESTDIR}/METALOG
@ -1239,6 +1235,15 @@ create-world-packages:
-r ${DESTDIR} -o ${DESTDIR} ; \
done
STAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/stage
packages:
@mkdir -p ${MAKEOBJDIRPREFIX}${.CURDIR}/stage
${_+_}@cd ${.CURDIR}; \
${MAKE} buildworld >/dev/null ; \
${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} -DNO_ROOT stageworld >/dev/null ; \
${MAKE} DESTDIR=${DESTDIR:U${STAGEDIR}} create-world-packages
kernel-pkgs:
.if !defined(NO_ROOT)
@echo "ERROR: kernel-pkgs can only be done with -DNO_ROOT"; \