From owner-svn-src-projects@FreeBSD.ORG Sun Mar 15 14:05:56 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 674C0E7D; Sun, 15 Mar 2015 14:05:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 392C1695; Sun, 15 Mar 2015 14:05:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FE5ub6072729; Sun, 15 Mar 2015 14:05:56 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FE5tHj072727; Sun, 15 Mar 2015 14:05:55 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503151405.t2FE5tHj072727@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 15 Mar 2015 14:05:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280034 - projects/release-pkg X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2015 14:05:56 -0000 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"; \