svn commit: r280034 - projects/release-pkg

[Baptiste Daroussin]

Author: bapt
Date: Sun Mar 15 14:05:55 2015
New Revision: 280034
URL: https://svnweb.freebsd.org/changeset/base/280034

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

Modified:
  projects/release-pkg/Makefile
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile
==============================================================================
--- projects/release-pkg/Makefile	Sun Mar 15 13:55:54 2015	(r280033)
+++ projects/release-pkg/Makefile	Sun Mar 15 14:05:55 2015	(r280034)
@@ -113,7 +113,8 @@ 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 kernel-pkgs stageworld create-world-packages
+	xdev-links native-xtools kernel-pkgs stageworld create-world-packages \
+	packages
 
 TGTS+=	${SUBDIR_TARGETS}
 

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Sun Mar 15 13:55:54 2015	(r280033)
+++ projects/release-pkg/Makefile.inc1	Sun Mar 15 14:05:55 2015	(r280034)
@@ -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"; \